From dd95b87353109d5f1b1a08a81ff18d871183f1df Mon Sep 17 00:00:00 2001 From: HJfod <60038575+HJfod@users.noreply.github.com> Date: Tue, 19 Nov 2024 15:47:40 +0200 Subject: [PATCH] update todos --- loader/include/Geode/platform/platform.hpp | 7 +++---- loader/include/Geode/ui/ColorPickPopup.hpp | 6 ------ loader/src/loader/ModSettingsManager.cpp | 10 ---------- loader/src/utils/PlatformID.cpp | 4 ++-- 4 files changed, 5 insertions(+), 22 deletions(-) diff --git a/loader/include/Geode/platform/platform.hpp b/loader/include/Geode/platform/platform.hpp index 2ef19b36..331c8aeb 100644 --- a/loader/include/Geode/platform/platform.hpp +++ b/loader/include/Geode/platform/platform.hpp @@ -114,7 +114,6 @@ namespace geode { class PlatformID { public: - // todo in v4: make these flags and add archless Mac and Android as well as Desktop and Mobile and remove Linux enum { Unknown = 0b000000, Windows = 0b000001, @@ -184,11 +183,11 @@ namespace geode { /** * Returns the list of platforms covered by this string name. For * example, "android" would return both Android32 and Android64 - * todo in v4: deprecate this as the flagged version deals with this + * todo in v5: deprecate this as the flagged version deals with this */ static GEODE_DLL std::vector getCovered(std::string_view str); - // todo in v4: this does not need to be constexpr in the header. dllexport it + // todo in v5: this does not need to be constexpr in the header. dllexport it static constexpr char const* toString(Type lp) { switch (lp) { case Unknown: return "Unknown"; @@ -203,7 +202,7 @@ namespace geode { return "Undefined"; } - // todo in v4: this does not need to be constexpr in the header. dllexport it + // todo in v5: this does not need to be constexpr in the header. dllexport it static constexpr char const* toShortString(Type lp, bool ignoreArch = false) { switch (lp) { case Unknown: return "unknown"; diff --git a/loader/include/Geode/ui/ColorPickPopup.hpp b/loader/include/Geode/ui/ColorPickPopup.hpp index 5a1b298d..24ef70d6 100644 --- a/loader/include/Geode/ui/ColorPickPopup.hpp +++ b/loader/include/Geode/ui/ColorPickPopup.hpp @@ -13,12 +13,6 @@ namespace geode { virtual void updateColor(cocos2d::ccColor4B const& color) {} }; - // todo in v4: maybe use events over the delegate? - // thing with events is that if you just filter via ColorPickPopup* it - // won't work unless you automatically detach the filter when closing the - // popup (otherwise opening another popup really quickly will just be - // allocated into the same memory and now the old filter is catching the - // new popup too) class GEODE_DLL ColorPickPopup : public Popup, public cocos2d::extension::ColorPickerDelegate, diff --git a/loader/src/loader/ModSettingsManager.cpp b/loader/src/loader/ModSettingsManager.cpp index d18b664e..352c6902 100644 --- a/loader/src/loader/ModSettingsManager.cpp +++ b/loader/src/loader/ModSettingsManager.cpp @@ -172,16 +172,6 @@ ModSettingsManager::ModSettingsManager(ModMetadata const& metadata) auto root = checkJson(json, "setting"); root.needs("type").into(setting.type); if (root) { - if (setting.type == "custom") { - log::warn( - "Setting \"{}\" in mod {} has the old \"custom\" type - " - "this type has been deprecated and will be removed in Geode v4.0.0. " - "Use the new \"custom:type-name-here\" syntax for defining custom " - "setting types - see more in " - "https://docs.geode-sdk.org/mods/settings/#custom-settings", - key, m_impl->modID - ); - } m_impl->settings.emplace(key, setting); } else { diff --git a/loader/src/utils/PlatformID.cpp b/loader/src/utils/PlatformID.cpp index a3fb35a7..0ba1176c 100644 --- a/loader/src/utils/PlatformID.cpp +++ b/loader/src/utils/PlatformID.cpp @@ -6,7 +6,7 @@ using namespace geode::prelude; PlatformID PlatformID::from(const char* str) { - // todo in v4: this should just be + // todo in v5: this should just be // "win" -> Windows // "mac", "mac-intel", "mac-arm" -> Mac // "ios" -> iOS @@ -38,7 +38,7 @@ PlatformID PlatformID::from(const char* str) { } bool PlatformID::coveredBy(const char* str, PlatformID t) { - // todo in v4: this is ridiculously inefficient currently - in v4 just use a flag check! + // todo in v5: this is ridiculously inefficient currently - in v5 just use a flag check! return ranges::contains(getCovered(str), t); }