diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js index 1976ce6e5c..e7de125e9c 100644 --- a/Library/0BDFDB.plugin.js +++ b/Library/0BDFDB.plugin.js @@ -2,7 +2,7 @@ * @name BDFDB * @author DevilBro * @authorId 278543574059057154 - * @version 2.8.7 + * @version 2.8.8 * @description Required Library for DevilBro's Plugins * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -1524,6 +1524,11 @@ module.exports = (_ => { } } }; + const leftSideMap = { + 16: 160, + 17: 170, + 18: 164 + }; BDFDB.ListenerUtils.addGlobal = function (plugin, id, keybind, action) { plugin = plugin == BDFDB && Internal || plugin; if (!BDFDB.ObjectUtils.is(plugin) || !id || !BDFDB.ArrayUtils.is(keybind) || typeof action != "function") return; @@ -1531,6 +1536,11 @@ module.exports = (_ => { BDFDB.ListenerUtils.removeGlobal(plugin, id); plugin.globalKeybinds[id] = BDFDB.NumberUtils.generateId(Object.entries(plugin.globalKeybinds).map(n => n[1])); BDFDB.LibraryModules.WindowUtils.inputEventRegister(plugin.globalKeybinds[id], keybind.map(n => [0, n]), action, {blurred: true, focused: true, keydown: false, keyup: true}); + if (Object.keys(leftSideMap).some(key => keybind.indexOf(parseInt(key)) > -1)) { + const alternativeId = id + "___ALTERNATIVE"; + plugin.globalKeybinds[alternativeId] = BDFDB.NumberUtils.generateId(Object.entries(plugin.globalKeybinds).map(n => n[1])); + BDFDB.LibraryModules.WindowUtils.inputEventRegister(plugin.globalKeybinds[alternativeId], keybind.map(n => [0, leftSideMap[n] ?? n]), action, {blurred: true, focused: true, keydown: false, keyup: true}); + } return (_ => BDFDB.ListenerUtils.removeGlobal(plugin, id)); }; BDFDB.ListenerUtils.removeGlobal = function (plugin, id) { @@ -1542,6 +1552,9 @@ module.exports = (_ => { else { BDFDB.LibraryModules.WindowUtils.inputEventUnregister(plugin.globalKeybinds[id]); delete plugin.globalKeybinds[id]; + const alternativeId = id + "___ALTERNATIVE"; + BDFDB.LibraryModules.WindowUtils.inputEventUnregister(plugin.globalKeybinds[alternativeId]); + delete plugin.globalKeybinds[alternativeId]; } }; BDFDB.ListenerUtils.multiAdd = function (node, actions, callback) { diff --git a/Plugins/GameActivityToggle/GameActivityToggle.plugin.js b/Plugins/GameActivityToggle/GameActivityToggle.plugin.js index e3a52248d6..a8236ab6ca 100644 --- a/Plugins/GameActivityToggle/GameActivityToggle.plugin.js +++ b/Plugins/GameActivityToggle/GameActivityToggle.plugin.js @@ -2,7 +2,7 @@ * @name GameActivityToggle * @author DevilBro * @authorId 278543574059057154 - * @version 1.1.6 + * @version 1.1.7 * @description Adds a Quick-Toggle Game Activity Button * @invite Jx3TjNS * @donate https://www.paypal.me/MircoWittrien @@ -238,8 +238,8 @@ module.exports = (_ => { } activateKeybind () { - if (keybind && keybind.length) BDFDB.ListenerUtils.addGlobal(this, "GAMEACTIVITY_TOGGLE", keybind, this.toggle); - else BDFDB.ListenerUtils.removeGlobal(this, "GAMEACTIVITY_TOGGLE", keybind, this.toggle); + if (keybind && keybind.length) BDFDB.ListenerUtils.addGlobal(this, "GAMEACTIVITY_TOGGLE", keybind, _ => this.toggle()); + else BDFDB.ListenerUtils.removeGlobal(this, "GAMEACTIVITY_TOGGLE"); } toggle () {