more removal of geode.hpp headers

loader/src/hooks/MenuLayer.cpp

@@ -1,4 +1,4 @@
-#include <Geode/utils/WackyGeodeMacros.hpp>
+#include <Geode/utils/cocos.hpp>
 #include <Geode/ui/BasedButtonSprite.hpp>
 #include <Geode/ui/Notification.hpp>
 #include <Index.hpp>

loader/src/ui/internal/credits/link.cpp

@@ -1,4 +1,4 @@
-#include <Geode/Geode.hpp>
+#include <Geode/utils/string.hpp>
 
 USE_GEODE_NAMESPACE();
 

loader/src/ui/internal/dev/HookListLayer.cpp

@@ -1,4 +1,5 @@
 #include "HookListLayer.hpp"
+#include <codegenned/binding/GJListLayer.hpp>
 
 bool HookListLayer::init(Mod* mod) {
     if (!GJDropDownLayer::init("Hooks", 220.f))

loader/src/ui/internal/dev/HookListLayer.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "HookListView.hpp"
+#include <codegenned/binding/GJDropDownLayer.hpp>
 
 class HookListLayer : public GJDropDownLayer {
     protected:

loader/src/ui/internal/dev/HookListView.cpp

@@ -1,4 +1,7 @@
 #include "HookListView.hpp"
+#include <codegenned/binding/TableView.hpp>
+#include <codegenned/binding/StatsCell.hpp>
+#include <Geode/utils/casts.hpp>
 
 HookCell::HookCell(const char* name, CCSize size) :
     TableViewCell(name, size.width, size.height) {}

loader/src/ui/internal/dev/HookListView.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <Geode/Geode.hpp>
+#include <codegenned/binding/TableViewCell.hpp>
+#include <codegenned/binding/CustomListView.hpp>
 
 USE_GEODE_NAMESPACE();
 

loader/src/ui/internal/dev/HotReloadLayer.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Geode/Geode.hpp>
+#include <cocos2d.h>
 
 USE_GEODE_NAMESPACE();
 

loader/src/ui/internal/info/CategoryNode.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Geode/Geode.hpp>
+#include <cocos2d.h>
 
 USE_GEODE_NAMESPACE();
 

loader/src/ui/internal/info/ModInfoLayer.cpp

@@ -2,11 +2,18 @@
 #include "../dev/HookListLayer.hpp"
 #include <Geode/ui/BasedButton.hpp>
 #include "../list/ModListView.hpp"
-#include <Geode/utils/WackyGeodeMacros.hpp>
+#include <Geode/utils/casts.hpp>
+#include <Geode/utils/vector.hpp>
 #include <Geode/ui/IconButtonSprite.hpp>
 #include <Geode/ui/MDPopup.hpp>
 #include "../settings/ModSettingsPopup.hpp"
 #include <InternalLoader.hpp>
+#include <codegenned/binding/Slider.hpp>
+#include <codegenned/binding/SliderThumb.hpp>
+#include <codegenned/binding/ButtonSprite.hpp>
+#include <codegenned/binding/SliderTouchLogic.hpp>
+#include <codegenned/binding/GJListLayer.hpp>
+#include <codegenned/binding/CCTextInputNode.hpp>
 
 // TODO: die
 #undef min

loader/src/ui/internal/info/ModInfoLayer.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <Geode/Geode.hpp>
+#include <codegenned/binding/FLAlertLayer.hpp>
+#include <codegenned/binding/FLAlertLayerProtocol.hpp>
 #include <Index.hpp>
 #include <Geode/ui/MDTextArea.hpp>
 #include <Geode/ui/Scrollbar.hpp>

loader/src/ui/internal/list/ModListLayer.cpp

@@ -3,6 +3,15 @@
 #include "SearchFilterPopup.hpp"
 #include <Geode/ui/Notification.hpp>
 #include <optional>
+#include <codegenned/binding/GJListLayer.hpp>
+#include <codegenned/binding/CCTextInputNode.hpp>
+#include <codegenned/binding/ButtonSprite.hpp>
+#include <codegenned/binding/LoadingCircle.hpp>
+#include <codegenned/binding/MenuLayer.hpp>
+#include <codegenned/binding/GameToolbox.hpp>
+#include <codegenned/binding/StatsCell.hpp>
+#include <codegenned/binding/TableView.hpp>
+#include <Geode/utils/casts.hpp>
 
 static ModListType g_tab = ModListType::Installed;
 static ModListLayer* g_instance = nullptr;

loader/src/ui/internal/list/ModListLayer.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Geode/Geode.hpp>
+#include <codegenned/binding/TextInputDelegate.hpp>
 #include "ModListView.hpp"
 #include <Index.hpp>
 

loader/src/ui/internal/list/ModListView.cpp

@@ -1,10 +1,15 @@
 #include "ModListView.hpp"
 #include "../info/ModInfoLayer.hpp"
-#include <Geode/utils/WackyGeodeMacros.hpp>
+#include <Geode/utils/cocos.hpp>
+#include <Geode/utils/casts.hpp>
+#include <Geode/utils/string.hpp>
 #include <Index.hpp>
 #include "ModListLayer.hpp"
 #include <InternalLoader.hpp>
 #include "../info/CategoryNode.hpp"
+#include <codegenned/binding/StatsCell.hpp>
+#include <codegenned/binding/ButtonSprite.hpp>
+#include <codegenned/binding/TableView.hpp>
 
 template<class T>
 static bool tryOrAlert(Result<T> const& res, const char* title) {

loader/src/ui/internal/list/ModListView.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
-#include <Geode/Geode.hpp>
+#include <codegenned/binding/TableViewCell.hpp>
+#include <codegenned/binding/FLAlertLayerProtocol.hpp>
+#include <codegenned/binding/CustomListView.hpp>
 #include <Index.hpp>
 #include <optional>
 

loader/src/ui/internal/list/SearchFilterPopup.cpp

@@ -3,6 +3,7 @@
 #include "ModListView.hpp"
 #include <Geode/ui/SelectList.hpp>
 #include "../info/CategoryNode.hpp"
+#include <codegenned/binding/GameToolbox.hpp>
 
 bool SearchFilterPopup::setup(ModListLayer* layer, ModListType type) {
     m_noElasticity = true;

loader/src/utils/windows/util.cpp

@@ -1,5 +1,5 @@
 #include <Geode/utils/platform.hpp>
-#include <Geode/Geode.hpp>
+#include <fs/filesystem.hpp>
 
 #ifdef GEODE_IS_WINDOWS
 

loader/test/dependency/main.cpp

@@ -1,4 +1,4 @@
-#include <Geode/Geode.hpp>
+#include <Geode/Loader.hpp>
 
 USE_GEODE_NAMESPACE();
 

loader/test/main/main.cpp

@@ -1,4 +1,4 @@
-#include <Geode/Geode.hpp>
+#include <Geode/Loader.hpp>
 
 USE_GEODE_NAMESPACE();
 

loader/test/shared.hpp

@@ -1,5 +1,5 @@
 #define EXPORT_NAME TestDependency
-#include <Geode/Geode.hpp>
+#include <Geode/Loader.hpp>
 
 API_INIT("com.geode.testdep")