increase timeout and fix server console delays

TabulateJarl8 · Jun 8, 2021 · 5a8675e · 5a8675e
1 parent 09339ab
commit 5a8675e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>com.tabulate.modpackSwitcher</groupId>
   <artifactId>switcher</artifactId>
-  <version>1.0</version>
+  <version>1.1</version>
 
   <name>switcher</name>
   <url>http://tabulatejarl8.github.io</url>

diff --git a/src/main/java/modpackSwitcher/Main.java b/src/main/java/modpackSwitcher/Main.java
@@ -145,7 +145,7 @@ public boolean accept(File file, String s) {
 
 
             // Print out modpack choices
-            System.out.println("Select a pack. Last used pack will be started in 5 seconds.");
+            System.out.println("Select a pack. Last used pack will be started in 10 seconds.");
             for (int i = 0; i < (modpacks.length); i++) {
                 System.out.print((i + 1) + ". " + modpacks[i]);
 
@@ -157,7 +157,9 @@ public boolean accept(File file, String s) {
             }
             System.out.println();
 
-            stringChoice = getModpackSelectionWithTimeout(5, lastUsedPack, modpacks, ansi);
+            System.out.println("Which modpack? [1-" + modpacks.length + "] ");
+
+            stringChoice = getModpackSelectionWithTimeout(10, "> ", lastUsedPack, modpacks, ansi);
             choice = Integer.parseInt(stringChoice);
 
             // Write last used modpack if changed
@@ -251,7 +253,7 @@ public int writeFile(String directoryName, String fileName, String value){
         }
     }
 
-    public String getModpackSelectionWithTimeout(int delay, int defaultChoice, String[] modpacks, boolean ansi){
+    public String getModpackSelectionWithTimeout(int delay, String message, int defaultChoice, String[] modpacks, boolean ansi){
         defaultChoice++;
         Callable<Integer> k = new Callable<Integer>() {
             @Override
@@ -264,7 +266,7 @@ public Integer call() {
         boolean valid;
         ExecutorService l = Executors.newFixedThreadPool(1);
         Future<Integer> g;
-        System.out.print("Which modpack? [1-" + modpacks.length + "] ");
+        System.out.print(message);
         g = l.submit(k);
         done: while (System.currentTimeMillis() - start < delay * 1000L) {
             do {
@@ -285,7 +287,7 @@ public Integer call() {
                         g = l.submit(k);
                         valid = false;
                         // Reset timer
-                        System.out.print("Which modpack? [1-" + modpacks.length + "] ");
+                        System.out.print(message);
                         start = System.currentTimeMillis();
                     }
                 }
@@ -309,4 +311,4 @@ class Fore {
     public static String CYAN = "\u001b[36m";
     public static String WHITE = "\u001b[37m";
     public static String RESET = "\u001b[0m";
-}
+}