clean up optional api

Author: matcool

README.md

@@ -6,21 +6,20 @@ Adds support for customizing keybinds in the editor and while playing.
 
 You can use Custom Keybinds as a dependency by declaring it in your `mod.json`:
 
-```json
+```jsonc
 {
-    "dependencies": [
-        {
+    "dependencies": {
+        "geode.custom-keybinds": {
             "id": "geode.custom-keybinds",
             "version": "v1.1.0",
             "importance": "required"
-        }
+        },
         // or the optional api version
-        {
-            "id": "geode.custom-keybinds",
+        "geode.custom-keybinds": {
             "version": "v1.1.0",
             "importance": "recommended"
         }
-    ]
+    }
 }
 ```
 
@@ -30,6 +29,8 @@ Registering can be done easily using `$execute`:
 
 ```cpp
 #include <geode.custom-keybinds/include/Keybinds.hpp>
+// optional api version
+#include <geode.custom-keybinds/include/OptionalAPI.hpp>
 
 using namespace keybinds;
 
@@ -72,13 +73,15 @@ Now your bind shows up in the UI, and the user can assign their own binds to it.
 
 ```cpp
 #include <geode.custom-keybinds/include/Keybinds.hpp>
+// optional api version
+#include <geode.custom-keybinds/include/OptionalAPI.hpp>
 
 using namespace keybinds;
 
 bool MyLayer::init() {
     ...
 
-    this->template addEventListener<InvokeBindFilter>([=](InvokeBindEvent* event) {
+    this->addEventListener<InvokeBindFilter>([=](InvokeBindEvent* event) {
         if (event->isDown()) {
             // do a backflip!
         }
@@ -88,7 +91,7 @@ bool MyLayer::init() {
     }, "backflip"_spr);
 
     // optional api version
-    this->template addEventListener<InvokeBindFilterV2>([=](InvokeBindEventV2* event) {
+    this->addEventListener<InvokeBindFilterV2>([=](InvokeBindEventV2* event) {
         if (event->isDown()) {
             // do a backflip!
         }
@@ -109,6 +112,8 @@ You can listen for global keybinds via an `$execute` block:
 
 ```cpp
 #include <geode.custom-keybinds/include/Keybinds.hpp>
+// optional api version
+#include <geode.custom-keybinds/include/OptionalAPI.hpp>
 
 using namespace keybinds;
 

changelog.md

@@ -1,4 +1,5 @@
-# Changelog
+## v1.11.0
+- Add optional API for developers!
 
 ## v1.10.4
 - Fix the keybind search box being offset by half its width

include/OptionalAPI.hpp

@@ -46,14 +46,14 @@ namespace keybinds {
         class Impl;
         std::unique_ptr<Impl> m_impl;
     public:
-        static geode::Result<Keybind*> create(cocos2d::enumKeyCodes key, Modifier modifiers = Modifier::None) GEODE_EVENT_EXPORT(&KeybindV2::create, (key, modifiers));
+        static geode::Result<Keybind*> create(cocos2d::enumKeyCodes key, ModifierV2 modifiers = ModifierV2::None) GEODE_EVENT_EXPORT(&KeybindV2::create, (key, modifiers));
     };
 
     class MouseBindV2 final {
         class Impl;
         std::unique_ptr<Impl> m_impl;
     public:
-        static geode::Result<MouseBind*> create(MouseButton button, Modifier modifiers = Modifier::None) GEODE_EVENT_EXPORT(&MouseBindV2::create, (button, modifiers));
+        static geode::Result<MouseBind*> create(MouseButton button, ModifierV2 modifiers = ModifierV2::None) GEODE_EVENT_EXPORT(&MouseBindV2::create, (button, modifiers));
     };
 
     class ControllerBindV2 final {

mod.json

@@ -1,11 +1,11 @@
 {
-	"geode": "4.6.1",
+	"geode": "4.8.0",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",
 		"mac": "2.2074"
 	},
-	"version": "v1.10.4",
+	"version": "v1.11.0",
 	"id": "geode.custom-keybinds",
 	"name": "Custom Keybinds",
 	"developer": "Geode Team",
@@ -33,4 +33,4 @@
 			"type": "custom:open-menu"
 		}
 	}
-}
+}

src/Keybinds.cpp

@@ -763,11 +763,11 @@ void BindManager::save() {
     BindManager::get()->save();
 }
 
-Result<Keybind*> KeybindV2::create(cocos2d::enumKeyCodes key, Modifier modifiers) {
+Result<Keybind*> KeybindV2::create(cocos2d::enumKeyCodes key, ModifierV2 modifiers) {
     return Ok(Keybind::create(key, modifiers));
 }
 
-Result<MouseBind*> MouseBindV2::create(MouseButton button, Modifier modifiers) {
+Result<MouseBind*> MouseBindV2::create(MouseButton button, ModifierV2 modifiers) {
     return Ok(MouseBind::create(button, modifiers));
 }