add api, remove unnecessary constants, handle warnings better

Author: nytelytee

CMakeLists.txt

@@ -50,14 +50,12 @@ if (MSVC)
     "/Wall"
     "/wd4820"  # padding inserted
     "/wd4710"  # function not inlined
-    #"/wd4265"  # non-virtual destructor
     "/wd5045"  # disable spectre mitigation warning
     # implicitly marked as deleted
     "/wd4625"
     "/wd5026"
     "/wd4626"
     "/wd5027"
-    "/wd4464"  # relative include path, in geode
   )
 else()
   target_compile_options(

include/api/api.hpp

@@ -1,8 +1,9 @@
 #pragma once
 
 #include <Geode/loader/Mod.hpp>
-#include <api/base.hpp>
-#include <api/events.hpp>
+
+#include "base.hpp"
+#include "events.hpp"
 
 // declaration and documentation
 namespace nytelyte {

include/api/base.hpp

@@ -1,14 +1,6 @@
 #pragma once
 
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#endif
 #include <Geode/loader/Dispatch.hpp>
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-
 
 #define ICON_KIT_FILTER_AND_SORT_ID "nytelyte.icon_kit_filter_and_sort"
 

include/api/events.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+/*
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -9,6 +10,7 @@
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
+*/
 
 #include <api/base.hpp>
 

include/constants.hpp

@@ -19,7 +19,6 @@ enum SortType { Number, LockStatus, Category, Author };
 const SortType DEFAULT_SORT_TYPES[SORT_TYPE_COUNT] = { SortType::Number, SortType::LockStatus, SortType::Category, SortType::Author };
 const bool DEFAULT_SORT_REVERSES[SORT_TYPE_COUNT] = { false, false, false, false };
 
-enum PathType { Fire = 1, Ice, Poison, Shadow, Lava, Earth, Blood, Metal, Light, Souls };
 extern std::unordered_map<SortType, std::string> SORT_TYPE_NAMES;
 
 extern std::unordered_map<UnlockType, int> VANILLA_MAX_ICONS;
@@ -30,10 +29,6 @@ extern std::vector<UnlockType> UNLOCK_TYPES_TO_CHANGE;
 #define SHOULD_CHANGE_ICON_TYPE(iconType) (std::find(ICON_TYPES_TO_CHANGE.begin(), ICON_TYPES_TO_CHANGE.end(), iconType) != ICON_TYPES_TO_CHANGE.end())
 #define SHOULD_CHANGE_UNLOCK_TYPE(unlockType) (std::find(UNLOCK_TYPES_TO_CHANGE.begin(), UNLOCK_TYPES_TO_CHANGE.end(), unlockType) != UNLOCK_TYPES_TO_CHANGE.end())
 extern std::unordered_map<UnlockType, std::string> ICON_NAMES;
-extern std::unordered_map<UnlockType, std::vector<int>> SPECIAL_UNLOCK_ORDER;
-extern std::vector<std::pair<int, UnlockType>> SHARDS_OF_POWER_UNLOCK_ORDER;
-extern std::unordered_map<PathType, std::vector<std::pair<int, UnlockType>>> PATHS_UNLOCK_ORDER;
-
 
 const float VERTICAL_BORDER_SIZE = 5.f;
 const float HORIZONTAL_BORDER_SIZE = 3.25f;

include/hooks/GJGarageLayer.hpp

@@ -1,18 +1,8 @@
 #pragma once
 
 #include <Geode/Geode.hpp>
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4265)  // non-virtual destructor
-#endif
-
 #include <Geode/modify/GJGarageLayer.hpp>
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
 using namespace geode::prelude;
 
 struct HookedGJGarageLayer : Modify<HookedGJGarageLayer, GJGarageLayer> {

include/hooks/GameManager.hpp

@@ -1,18 +1,8 @@
 #pragma once
 
 #include <Geode/Geode.hpp>
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4265)  // non-virtual destructor
-#endif
-
 #include <Geode/modify/GameManager.hpp>
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif // MSVC
-
 using namespace geode::prelude;
 
 struct HookedGameManager : Modify<HookedGameManager, GameManager> {

include/hooks/PurchaseItemPopup.hpp

@@ -1,18 +1,8 @@
 #pragma once
 
 #include <Geode/Geode.hpp>
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4265)  // non-virtual destructor
-#endif
-
 #include <Geode/modify/PurchaseItemPopup.hpp>
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif // MSVC
-
 #include <iconkit.hpp>
 #include <logic.hpp>
 

include/moreicons.hpp

@@ -10,6 +10,7 @@
     {"id": "geode.node-ids", "version": ">=v1.2.0", "importance": "required"},
     {"id": "hiimjustin000.more_icons", "version": ">=v1.14.6", "importance": "suggested"}
   ],
+  "api": {"include": ["include/api/*.hpp"]},
   "repository": "https://github.com/nytelytee/geode-icon-kit-filter-and-sort.git",
   "resources": {
     "spritesheets": {