From 0cab64db50ae98e29a4baec232cef948947ea4a0 Mon Sep 17 00:00:00 2001 From: Henry Gabryjelski Date: Wed, 18 Aug 2021 20:03:00 -0700 Subject: [PATCH] Add missing delays, remove unused variable --- Macropad_Hotkeys/macros/minecraft-messages.py | 13 ++++---- .../macros/minecraft-pe-effects.py | 30 +++++++++---------- Macropad_Hotkeys/macros/minecraft-pe-equip.py | 3 ++ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Macropad_Hotkeys/macros/minecraft-messages.py b/Macropad_Hotkeys/macros/minecraft-messages.py index d4e62a08d..feac40128 100644 --- a/Macropad_Hotkeys/macros/minecraft-messages.py +++ b/Macropad_Hotkeys/macros/minecraft-messages.py @@ -7,7 +7,6 @@ from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values DELAY_AFTER_ESCAPE = 0.05 -DELAY_AFTER_COMMAND = 0.10 app = { # REQUIRED dict, must be named 'app' 'name' : 'Minecraft (/msg)', # Application name @@ -15,15 +14,15 @@ app = { # REQUIRED dict, must be named 'app' # COLOR LABEL KEY SEQUENCE # 1st row ---------- (0x000020, 'list', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/list', Keycode.RETURN, -Keycode.RETURN]), (0x000020, 'list', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/list', Keycode.RETURN, -Keycode.RETURN]), (0x000020, 'list', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/list', Keycode.RETURN, -Keycode.RETURN]), # 2nd row ---------- @@ -36,15 +35,15 @@ app = { # REQUIRED dict, must be named 'app' (0x000000, '', []), # 4th row ---------- (0x101010, 'bed', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/msg @a Time for bed!', Keycode.RETURN, -Keycode.RETURN]), (0x101010, 'bed', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/msg @a Time for bed!', Keycode.RETURN, -Keycode.RETURN]), (0x101010, 'bed', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/msg @a Time for bed!', Keycode.RETURN, -Keycode.RETURN]), # Encoder button --- diff --git a/Macropad_Hotkeys/macros/minecraft-pe-effects.py b/Macropad_Hotkeys/macros/minecraft-pe-effects.py index 69e9019ad..dafc07a2b 100644 --- a/Macropad_Hotkeys/macros/minecraft-pe-effects.py +++ b/Macropad_Hotkeys/macros/minecraft-pe-effects.py @@ -11,81 +11,81 @@ from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values DELAY_AFTER_ESCAPE = 0.05 DELAY_AFTER_COMMAND = 0.10 -app = { # REQUIRED dict, must be named 'app' +app = { # REQUIRED dict, must be named 'app' 'name' : 'Minecraft PE (effect)', # Application name # # /effect # [seconds: int] [amplifier: int] [hideParticles: Boolean] # - 'macros' : [ # List of button macros... + 'macros' : [ # List of button macros... # COLOR LABEL KEY SEQUENCE # 1st row ---------- (0x002000, 'speed', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s speed 999999999 1 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), (0x002000, 'str', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s strength 999999999 1 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), (0x002000, 'haste', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s haste 999999999 1 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), # 2nd row ---------- (0x002000, 'jump', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s jump_boost 999999999 1 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), (0x000030, 'breath', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s water_breathing 999999999 0 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), (0x202020, 'darkv', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s night_vision 999999999 0 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), # 3rd row ---------- (0x300000, 'health', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s health_boost 999999999 4 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), (0x300000, 'regen', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s regeneration 999999999 4 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), (0x002000, 'absorb', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s absorption 999999999 3 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), # 4th row --------- (0x002000, 'resist', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s resistance 999999999 3 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), (0x101010, 'invis', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s invisibility 999999999 0 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), (0x300000, 'fire_r', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s fire_resistance 999999999 0 true', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), # Encoder button --- Remove all status effects.... (0x000000, '', [ - Keycode.ESCAPE, -Keycode.ESCAPE, + Keycode.ESCAPE, -Keycode.ESCAPE, DELAY_AFTER_ESCAPE, '/effect @s clear', Keycode.RETURN, -Keycode.RETURN, Keycode.ESCAPE, -Keycode.ESCAPE]), diff --git a/Macropad_Hotkeys/macros/minecraft-pe-equip.py b/Macropad_Hotkeys/macros/minecraft-pe-equip.py index 95b5b12f6..ed02d48fb 100644 --- a/Macropad_Hotkeys/macros/minecraft-pe-equip.py +++ b/Macropad_Hotkeys/macros/minecraft-pe-equip.py @@ -11,6 +11,9 @@ from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values # Unfortunately, bedrock edition has no single command that both # gives an item and enchants it. Thus, have to place the item in # the player's inventory slot, enchant it, then equip it. +# +# As a result, it is probably better to learn on less complex +# macro files before attempting to adjust settings in this one. from adafruit_hid.keycode import Keycode # REQUIRED if using Keycode.* values