2.208

Author: GDColon

README.md

@@ -108,7 +108,7 @@ Default keybind is HOME
 
 **Button properties** can be a string, OR an object with any of:
 - `content` (string or Text) - The message on the button
-- `background` (string) - Button color
+- `background` (string or int) - Button color
     - green, cyan, pink, grey, darkgrey, red, geodeblue, geodepink, geodepurple, geodeblack or trans
     - Uses GJ_button_0#.png texture in resources folder
 - `texture` ([filename](#texture-files-can-be-read-from)) - Custom button texture, overrides background
@@ -462,7 +462,7 @@ Icon types (1-15):
 
 Reward types (1-15):
 
-`fireShard`, `iceShard`, `poisonShard`, `shadowShard`, `lavaShard`, `key`, `keys`, `orb`, `orbs`, `diamond`, `diamonds`, `icon`, `earthShard`, `bloodShard`, `metalShard`, `lightShard`, `soulShard`, `goldKey`
+`fireShard`, `iceShard`, `poisonShard`, `shadowShard`, `lavaShard`, `key`, `orb`, `diamond`, `icon`, `earthShard`, `bloodShard`, `metalShard`, `lightShard`, `soulShard`, `goldKey`
 
 Item types (1-19):
 

changelog.md

@@ -1,3 +1,6 @@
+# 1.0.6
+- 2.208 support
+
 # 1.0.5
 - Added `instant` property for popups which skips the bounce animation
 - Fixed buttons not being the correct width

mod.json

@@ -1,12 +1,12 @@
 {
-	"geode": "4.6.1",
+	"geode": "5.0.0",
 	"gd": {
-		"win": "2.2074",
-		"mac": "2.2074"
+		"win": "2.2081",
+		"mac": "2.2081"
 	},
 	"id": "colon.customtextboxes",
 	"name": "Custom Textboxes",
-	"version": "v1.0.5",
+	"version": "v1.0.6",
 	"developer": "Colon",
 	"description": "Display custom popups, chests, and more",
 	"resources": {
@@ -17,8 +17,8 @@
 		"source": "https://github.com/GDColon/Custom-Textboxes"
 	},
 	"dependencies": {
-		"geode.node-ids": { "version": ">=1.20.0", "importance": "required" },
-		"geode.texture-loader": { "version": ">=1.7.0", "importance": "suggested" }
+		"geode.node-ids": { "version": ">=1.20.0", "required": true },
+		"geode.texture-loader": { "version": ">=1.7.0", "required": false }
 	},
 	"settings": {
 		"key_popup": {

src/KeyPicker/KeyPickerPopup.cpp

@@ -1,7 +1,9 @@
 #include <Geode/Geode.hpp>
 #include "KeyPickerPopup.hpp"
 
-bool KeyPickerPopup::setup(enumKeyCodes current, std::function<void(enumKeyCodes)> onConfirm) {
+bool KeyPickerPopup::init(enumKeyCodes current, std::function<void(enumKeyCodes)> onConfirm) {
+
+    if (!Popup::init(220.0f, 130.0f)) return false;
 
     key = current;
     this->setTitle("Press a key!", "bigFont.fnt");
@@ -20,7 +22,7 @@ bool KeyPickerPopup::setup(enumKeyCodes current, std::function<void(enumKeyCodes
     return true;
 }
 
-void KeyPickerPopup::keyDown(enumKeyCodes pressedKey) {
+void KeyPickerPopup::keyDown(enumKeyCodes pressedKey, double balls) {
     if (pressedKey == enumKeyCodes::KEY_Escape) pressedKey = enumKeyCodes::KEY_None;
     int k = int(pressedKey);
     if (k < 0) return;

src/KeyPicker/KeyPickerPopup.hpp

@@ -3,24 +3,24 @@
 #include <Geode/ui/Popup.hpp>
 using namespace geode::prelude;
 
-class KeyPickerPopup : public geode::Popup<enumKeyCodes, std::function<void(enumKeyCodes)>> {
+class KeyPickerPopup : public geode::Popup {
 protected:
-    bool setup(enumKeyCodes current, std::function<void(enumKeyCodes)> onConfirm) override;
-    void keyDown(cocos2d::enumKeyCodes key) override;
+    bool init(enumKeyCodes current, std::function<void(enumKeyCodes)> onConfirm);
+    void keyDown(cocos2d::enumKeyCodes key, double balls) override;
     void updateKeyLabel();
     enumKeyCodes key;
     CCLabelBMFont* keyLabel;
 public:
     static KeyPickerPopup* create(enumKeyCodes current, std::function<void(enumKeyCodes)> onConfirm) {
         auto ret = new KeyPickerPopup();
-        if (ret->initAnchored(220.0f, 130.0f, current, onConfirm)) {
+        if (ret->init(current, onConfirm)) {
             ret->autorelease();
             return ret;
         }
         delete ret;
         return nullptr;
     }
-    enumKeyCodes getKey() { return key; };
+    enumKeyCodes getKey() { return key; }
 };
 
 // I stole this from custom keybinds lol

src/KeyPicker/Keybind.hpp

@@ -1,15 +1,15 @@
 using namespace geode::prelude;
 
-struct Keybind {
+struct CTKeybind {
 	int value;
 
     // no idea what any of this does but it was in the docs
-	bool operator==(Keybind const& other) const = default;
+	bool operator==(CTKeybind const& other) const = default;
 	operator int() const { return value; };
 
-    Keybind() = default;
-    Keybind(int value) : value(value) {}
-    Keybind(Keybind const&) = default;
+    CTKeybind() = default;
+    CTKeybind(int value) : value(value) {}
+    CTKeybind(CTKeybind const&) = default;
 
     enumKeyCodes getKey() const { return static_cast<enumKeyCodes>(value); }
 };
@@ -32,15 +32,15 @@ class KeyPicker : public SettingBaseValueV3<int> {
 };   
 
 template <>
-struct matjson::Serialize<Keybind> {
-    static matjson::Value toJson(Keybind const& settingValue) { return settingValue.value; }
-    static Result<Keybind> fromJson(matjson::Value const& json) {
+struct matjson::Serialize<CTKeybind> {
+    static matjson::Value toJson(CTKeybind const& settingValue) { return settingValue.value; }
+    static Result<CTKeybind> fromJson(matjson::Value const& json) {
         GEODE_UNWRAP_INTO(auto num, json.asInt());
-        return Ok(Keybind(num));
+        return Ok(CTKeybind(num));
     }
 };
 
 template <>
-struct geode::SettingTypeForValueType<Keybind> {
+struct geode::SettingTypeForValueType<CTKeybind> {
     using SettingType = KeyPicker;
 };

src/main.cpp

@@ -66,9 +66,9 @@ std::string getTargetID(std::string path, bool alt) {
 
 // ===== //
 
-enumKeyCodes getPopupKey()   { return Mod::get()->getSettingValue<Keybind>("key_popup").getKey(); };
-enumKeyCodes getTextboxKey() { return Mod::get()->getSettingValue<Keybind>("key_dialogue").getKey(); };
-enumKeyCodes getChestKey()   { return Mod::get()->getSettingValue<Keybind>("key_chest").getKey(); };
+enumKeyCodes getPopupKey()   { return Mod::get()->getSettingValue<CTKeybind>("key_popup").getKey(); };
+enumKeyCodes getTextboxKey() { return Mod::get()->getSettingValue<CTKeybind>("key_dialogue").getKey(); };
+enumKeyCodes getChestKey()   { return Mod::get()->getSettingValue<CTKeybind>("key_chest").getKey(); };
 
 // ===== //
 
@@ -148,7 +148,7 @@ bool killAllAlerts() {
 	auto children = scene->getChildren();
 	for (int i = children->count() - 1; i >= 0; i--) {
 		CCNode* n = typeinfo_cast<CCNode*>(children->objectAtIndex(i));
-		if (n != nullptr && n->getID().starts_with(""_spr)) {
+		if (n != nullptr && std::string(n->getID()).starts_with(""_spr)) {
 			n->removeMeAndCleanup();
 			killed = true;
 		}
@@ -168,8 +168,8 @@ bool killAllAlerts() {
 
 // Handle key presses
 class $modify(CCKeyboardDispatcher) {
-	bool dispatchKeyboardMSG(enumKeyCodes key, bool down, bool repeat) {
-		if (repeat || !down || key == KEY_None || key == KEY_Unknown) return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, repeat);
+	bool dispatchKeyboardMSG(enumKeyCodes key, bool down, bool repeat, double time) {
+		if (repeat || !down || key == KEY_None || key == KEY_Unknown) return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, repeat, time);
 
 		else if (key == KEY_Escape && CCKeyboardDispatcher::get()->getShiftKeyPressed()) {
 			if (killAllAlerts()) return false;
@@ -179,7 +179,7 @@ class $modify(CCKeyboardDispatcher) {
 		else if (key == getTextboxKey()) prepTextbox();
 		else if (key == getChestKey()) prepChest();
 
-		return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, repeat);
+		return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, repeat, time);
 	}
 };