added macos custom keybinds support (please work)

Author: TimeStepYT

CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(DeltaruneTextboxes VERSION 1.2.9)
+project(DeltaruneTextboxes VERSION 1.3.0)
 
 add_library(${PROJECT_NAME} SHARED
     src/FLAlertLayer.cpp

about.md

@@ -13,6 +13,6 @@ If you're <c>able</c> to use the <cj>Custom Keybinds</c> mod, then you can <cj>r
 If you want to suggest a feature, create an issue on github or ping me on discord (@timestepyt)
 
 # Special Thanks
-<cr>prevter</c>: Answered my stupid questions, and helped a lot!
+<cr>prevter</c>: Answered my stupid questions and helped alot!
 
 JohnnyEnglish1: Reported a bug where choices don't appear, which never happened to me.

changelog.md

@@ -1,3 +1,6 @@
+### v1.3.0
+- Added Custom Keybinds support to MacOS!
+
 ### v1.2.9
 - Fixed the crash that was born due to the fix
 

mod.json

@@ -1,5 +1,5 @@
 {
-    "geode": "4.0.1",
+    "geode": "4.2.0",
     "gd": {
         "win": "2.2074",
         "android": "2.2074",
@@ -8,26 +8,27 @@
     },
     "id": "timestepyt.deltarune_textboxes",
     "name": "Deltarune Textboxes",
-    "version": "v1.2.9",
+    "version": "v1.3.0",
     "developer": "TimeStepYT",
     "description": "Makes Popups look like Deltarune",
     "links": {
         "source": "https://github.com/TimeStepYT/DeltaruneTextboxes"
     },
-    "tags": ["customization"],
-    "dependencies": [
-        {
-            "id": "geode.node-ids",
+    "tags": [
+        "customization"
+    ],
+    "dependencies": {
+        "geode.node-ids": ">=1.19.0",
+        "geode.custom-keybinds": {
             "importance": "required",
-            "version": ">=1.10.0"
-        },
-        {
-            "id": "geode.custom-keybinds",
             "version": ">=v1.7.1",
-            "platforms": ["win", "android64"],
-            "importance": "required"
+            "platforms": [
+                "win",
+                "macos",
+                "android64"
+            ]
         }
-    ],
+    },
     "resources": {
         "sprites": [
             "resources/undertaleSquare.png",
@@ -99,7 +100,10 @@
             "type": "bool",
             "default": false,
             "description": "Disables <cy>clicking</c> to progress textboxes",
-            "platforms": ["win", "mac"]
+            "platforms": [
+                "win",
+                "mac"
+            ]
         },
         "coloredPortraits": {
             "name": "Colored Portraits",
@@ -171,4 +175,4 @@
             ]
         }
     }
-}
+}

src/CCKeyboardDispatcher.cpp

@@ -1,6 +1,6 @@
 #include "include.h"
 
-#if !(defined(GEODE_IS_MACOS) || defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
+#if !(defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
 $execute{
 	keybinds::BindManager::get()->registerBindable(
 		{

src/FLAlertLayer.cpp

@@ -77,7 +77,7 @@ bool DeltaruneAlertLayer::init(FLAlertLayerProtocol* delegate, char const* title
 	textArea = m_mainLayer->getChildByID("content-text-area");
 	bg = m_mainLayer->getChildByID("background");
 	titleNode = static_cast<CCLabelBMFont*>(m_mainLayer->getChildByID("title"));
-#if !(defined(GEODE_IS_MACOS) || defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
+#if !(defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
 	initCustomKeybinds();
 #endif
 	Loader::get()->queueInMainThread([bg, titleNode, textArea, this] {
@@ -249,7 +249,7 @@ bool DeltaruneAlertLayer::ccTouchBegan(CCTouch* touch, CCEvent* event) {
 	clickedOnButton(btn2, m_button2, 2);
 	return ret;
 }
-#if (defined(GEODE_IS_MACOS) || defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
+#if (defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
 void DeltaruneAlertLayer::keyDown(enumKeyCodes key) {
 	if (m_fields->incompatible) {
 		FLAlertLayer::keyDown(key);

src/FLAlertLayer.h

@@ -70,7 +70,7 @@ class $modify(DeltaruneAlertLayer, FLAlertLayer) {
 	void clickedOnButton(CCMenuItemSpriteExtra*, ButtonSprite*, int);
 	bool ccTouchBegan(CCTouch*, CCEvent*) override;
 
-#if (defined(GEODE_IS_MACOS) || defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
+#if (defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
 	void keyDown(enumKeyCodes) override;
 #else 
 	void initCustomKeybinds();

src/changeDesign.cpp

@@ -111,7 +111,7 @@ void DeltaruneAlertLayer::changeButtons() {
 }
 
 void DeltaruneAlertLayer::changeTitle() {
-	CCLabelBMFont*& title = m_fields->title;
+	CCLabelBMFont* &title = m_fields->title;
 	auto& bg = m_fields->bg;
 	title->setAnchorPoint(CCPoint{ 0, 0 });
 	title->setFntFile("Determination.fnt"_spr);

src/include.h

@@ -1,7 +1,7 @@
 #include <Geode/Geode.hpp>
 
 #include <Geode/fmod/fmod.hpp>
-#if !(defined(GEODE_IS_MACOS) || defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
+#if !(defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
 #include <geode.custom-keybinds/include/Keybinds.hpp>
 #endif
 #include <Geode/modify/FLAlertLayer.hpp>