Implemented KeyEvent for KeyPreset

src/main/java/noppes/npcs/client/key/KeyEvent.java

@@ -0,0 +1,23 @@
+package noppes.npcs.client.key;
+
+public class KeyEvent {
+    public final KeyPreset.PressType type;
+    public final KeyPreset preset;
+    public final int keyCode;
+    public final boolean isMouse;
+    public final long timestamp;
+
+    public KeyEvent(KeyPreset.PressType type, KeyPreset preset) {
+        this.type = type;
+        this.preset = preset;
+        this.keyCode = preset.keyCode();
+        this.isMouse = preset.isMouseKey();
+        this.timestamp = System.currentTimeMillis();
+    }
+
+    public boolean is(KeyPreset.PressType t) { return this.type == t; }
+    public boolean isPress() { return is(KeyPreset.PressType.PRESS); }
+    public boolean isHold() { return is(KeyPreset.PressType.HOLD); }
+    public boolean isRelease() { return is(KeyPreset.PressType.RELEASE); }
+    public boolean isSinglePress() { return is(KeyPreset.PressType.SINGLE_PRESS); }
+}

src/main/java/noppes/npcs/client/key/KeyPreset.java

@@ -21,7 +21,7 @@ public class KeyPreset {
 
     public String name, description;
     public boolean shouldConflict = true;
-    public Consumer<PressType> task;
+    public Consumer<KeyEvent> task;
 
     public int pressTime;
     public boolean isDown;
@@ -42,7 +42,7 @@ public class KeyPreset {
         return this;
     }
 
-    public KeyPreset setTask(Consumer<PressType> task) {
+    public KeyPreset setTask(Consumer<KeyEvent> task) {
         this.task = task;
         return this;
     }
@@ -87,7 +87,7 @@ public class KeyPreset {
     public KeyPreset onAction(PressType... pressTypes) {
         if (task != null) {
             for (PressType pressType : pressTypes)
-                this.task.accept(pressType);
+                this.task.accept(new KeyEvent(pressType, this));
         }
         return this;
     }
@@ -124,12 +124,6 @@ public class KeyPreset {
         currentState.clear();
     }
 
-    //call on the last key added, to load saved presets
-    public KeyPreset markDone(KeyPresetManager manager) {
-        manager.load();
-        return this;
-    }
-
     public void writeToNbt(NBTTagCompound c) {
         c.setTag(name, currentState.writeToNbt());
     }