diff --git a/.gitignore b/.gitignore index c5e82d7..ae8c437 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -bin \ No newline at end of file +bin +target +target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e0f15db --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index a0f9db8..051e374 100644 --- a/pom.xml +++ b/pom.xml @@ -38,6 +38,28 @@ maven-clean-plugin 3.1.0 + + maven-assembly-plugin + + + + sig.App + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + maven-resources-plugin diff --git a/run b/run index 8610fd1..153ed35 100755 --- a/run +++ b/run @@ -1,2 +1,2 @@ -mvn package -java -cp target/ffxivai-1.0.jar main.java.sig.App \ No newline at end of file +mvn clean compile assembly:single +java -jar target/ffxivai-1.0-jar-with-dependencies.jar \ No newline at end of file diff --git a/src/main/java/sig/App.java b/src/main/java/sig/App.java index bf15260..6b399bc 100644 --- a/src/main/java/sig/App.java +++ b/src/main/java/sig/App.java @@ -1,4 +1,4 @@ -package main.java.sig; +package sig; import java.awt.AWTException; import java.awt.Robot; @@ -13,11 +13,11 @@ import com.github.kwhat.jnativehook.keyboard.NativeKeyListener; import javax.swing.JFrame; -public class App{ +public class App implements NativeKeyListener{ public static double FRAMETIME=0; public static Robot r; public static JFrame f; - public static void nativeKeyPressed(NativeKeyEvent e) { + public void nativeKeyPressed(NativeKeyEvent e) { System.out.println("Key Pressed: " + NativeKeyEvent.getKeyText(e.getKeyCode())); if (e.getKeyCode() == NativeKeyEvent.VC_ESCAPE) { @@ -29,15 +29,15 @@ public class App{ } } - public static void nativeKeyReleased(NativeKeyEvent e) { + public void nativeKeyReleased(NativeKeyEvent e) { System.out.println("Key Released: " + NativeKeyEvent.getKeyText(e.getKeyCode())); } - public static void nativeKeyTyped(NativeKeyEvent e) { + public void nativeKeyTyped(NativeKeyEvent e) { System.out.println("Key Typed: " + e.getKeyText(e.getKeyCode())); } - public static void main(String[] args) { + App() { try { GlobalScreen.registerNativeHook(); } @@ -48,7 +48,7 @@ public class App{ System.exit(1); } - GlobalScreen.addNativeKeyListener(new GlobalKeyListenerExample()); + GlobalScreen.addNativeKeyListener(this); try { @@ -59,6 +59,10 @@ public class App{ RunInitialAnalysis(); f = new JFrame("FFXIV AI"); } + + public static void main(String[] args) { + App a = new App(); + } private static void RunInitialAnalysis() { long startTime = System.nanoTime(); for (int i=0;i<60;i++) { diff --git a/target/ffxivai-1.0-SNAPSHOT.jar b/target/ffxivai-1.0-SNAPSHOT.jar deleted file mode 100644 index b7c0828..0000000 Binary files a/target/ffxivai-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/target/ffxivai-1.0.jar b/target/ffxivai-1.0.jar deleted file mode 100644 index ce5ded0..0000000 Binary files a/target/ffxivai-1.0.jar and /dev/null differ diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties deleted file mode 100644 index 9d13d11..0000000 --- a/target/maven-archiver/pom.properties +++ /dev/null @@ -1,4 +0,0 @@ -#Created by Apache Maven 3.8.1 -groupId=sig -artifactId=ffxivai -version=1.0 diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index 2e8116d..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1 +0,0 @@ -sig/AppTest.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index 8e5ee4d..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1 +0,0 @@ -/workspace/ffxivai/src/test/java/sig/AppTest.java diff --git a/target/surefire-reports/2021-10-05T00-35-44_836.dumpstream b/target/surefire-reports/2021-10-05T00-35-44_836.dumpstream deleted file mode 100644 index 7b4d0ae..0000000 --- a/target/surefire-reports/2021-10-05T00-35-44_836.dumpstream +++ /dev/null @@ -1,3 +0,0 @@ -# Created at 2021-10-05T00:35:45.115 -Picked up JAVA_TOOL_OPTIONS: -Xmx1879m - diff --git a/target/surefire-reports/2021-10-05T00-36-26_156.dumpstream b/target/surefire-reports/2021-10-05T00-36-26_156.dumpstream deleted file mode 100644 index ef9823e..0000000 --- a/target/surefire-reports/2021-10-05T00-36-26_156.dumpstream +++ /dev/null @@ -1,3 +0,0 @@ -# Created at 2021-10-05T00:36:26.369 -Picked up JAVA_TOOL_OPTIONS: -Xmx1879m - diff --git a/target/surefire-reports/2021-10-05T00-38-01_660.dumpstream b/target/surefire-reports/2021-10-05T00-38-01_660.dumpstream deleted file mode 100644 index b06068c..0000000 --- a/target/surefire-reports/2021-10-05T00-38-01_660.dumpstream +++ /dev/null @@ -1,3 +0,0 @@ -# Created at 2021-10-05T00:38:01.858 -Picked up JAVA_TOOL_OPTIONS: -Xmx1879m - diff --git a/target/surefire-reports/2021-10-05T00-39-02_258.dumpstream b/target/surefire-reports/2021-10-05T00-39-02_258.dumpstream deleted file mode 100644 index 6c3c1b8..0000000 --- a/target/surefire-reports/2021-10-05T00-39-02_258.dumpstream +++ /dev/null @@ -1,3 +0,0 @@ -# Created at 2021-10-05T00:39:02.461 -Picked up JAVA_TOOL_OPTIONS: -Xmx1879m - diff --git a/target/surefire-reports/2021-10-05T00-39-23_633.dumpstream b/target/surefire-reports/2021-10-05T00-39-23_633.dumpstream deleted file mode 100644 index 0023cfa..0000000 --- a/target/surefire-reports/2021-10-05T00-39-23_633.dumpstream +++ /dev/null @@ -1,3 +0,0 @@ -# Created at 2021-10-05T00:39:23.864 -Picked up JAVA_TOOL_OPTIONS: -Xmx1879m - diff --git a/target/surefire-reports/2021-10-05T00-41-13_566.dumpstream b/target/surefire-reports/2021-10-05T00-41-13_566.dumpstream deleted file mode 100644 index c79bc54..0000000 --- a/target/surefire-reports/2021-10-05T00-41-13_566.dumpstream +++ /dev/null @@ -1,3 +0,0 @@ -# Created at 2021-10-05T00:41:13.741 -Picked up JAVA_TOOL_OPTIONS: -Xmx1879m - diff --git a/target/surefire-reports/TEST-sig.AppTest.xml b/target/surefire-reports/TEST-sig.AppTest.xml deleted file mode 100644 index 1c86e8e..0000000 --- a/target/surefire-reports/TEST-sig.AppTest.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/surefire-reports/sig.AppTest.txt b/target/surefire-reports/sig.AppTest.txt deleted file mode 100644 index b6cae62..0000000 --- a/target/surefire-reports/sig.AppTest.txt +++ /dev/null @@ -1,4 +0,0 @@ -------------------------------------------------------------------------------- -Test set: sig.AppTest -------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.025 s - in sig.AppTest diff --git a/target/test-classes/sig/AppTest.class b/target/test-classes/sig/AppTest.class deleted file mode 100644 index b212b59..0000000 Binary files a/target/test-classes/sig/AppTest.class and /dev/null differ