Merge pull request #53 from Matts/bug/51

#51: No longer required to repress a button if you pressed it over a tick

Author: Matts

src/main/java/com/mattsmeets/macrokey/MacroKey.java

@@ -7,10 +7,7 @@
 import com.mattsmeets.macrokey.service.JsonConfig;
 import com.mattsmeets.macrokey.service.LogHelper;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraftforge.common.ForgeVersion;
-import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.ModMetadata;
 import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;

src/main/java/com/mattsmeets/macrokey/handler/GameTickHandler.java

@@ -1,5 +1,6 @@
 package com.mattsmeets.macrokey.handler;
 
+import com.mattsmeets.macrokey.MacroKey;
 import com.mattsmeets.macrokey.model.lambda.ExecuteOnTickInterface;
 import com.mattsmeets.macrokey.event.ExecuteOnTickEvent;
 import com.mattsmeets.macrokey.event.InGameTickEvent;
@@ -35,7 +36,7 @@ public void onKeyEvent(MacroActivationEvent event) {
         if (event.getMacroState().isKeyDown()) {
             this.macrosToRun.addAll(event.getMacros());
         } else {
-            this.macrosToRun.removeAll(event.getMacros());
+            this.macrosToRun.removeIf(macro -> event.getMacros().contains(macro) && !macro.willRepeat());
         }
     }
 

src/main/java/com/mattsmeets/macrokey/handler/hook/KeyInputHandler.java

@@ -1,5 +1,6 @@
 package com.mattsmeets.macrokey.handler.hook;
 
+import com.mattsmeets.macrokey.MacroKey;
 import com.mattsmeets.macrokey.event.ExecuteOnTickEvent;
 import com.mattsmeets.macrokey.event.MacroActivationEvent;
 import com.mattsmeets.macrokey.model.MacroInterface;

src/main/java/com/mattsmeets/macrokey/model/StringCommand.java

@@ -1,5 +1,6 @@
 package com.mattsmeets.macrokey.model;
 
+import com.mattsmeets.macrokey.MacroKey;
 import net.minecraft.client.entity.EntityPlayerSP;
 
 /**

src/test/java/com/mattsmeets/macrokey/handler/GameTickHandlerTest.java

@@ -60,9 +60,8 @@ public void testOnKeyEventAddsMacroWhenKeyUp() {
 
         handler.onKeyEvent(event);
 
-        verify(event).getMacros();
         verify(event).getMacroState();
-        verify(spySet).removeAll(macros);
+        verify(spySet).removeIf(any());
     }
 
     @Test