v0.2

- Added sleeping 3 seconds. - Optimized config. - Optimized threads.
Fede-Coder · Dec 24, 2020 · f295b6a · f295b6a
1 parent f24c4c1
commit f295b6a
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.srfairyox</groupId>
     <artifactId>Corvus</artifactId>
-    <version>0.1</version>
+    <version>0.2</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/src/main/java/com/srfairyox/Corvus/Controller.java b/src/main/java/com/srfairyox/Corvus/Controller.java
@@ -20,15 +20,12 @@
 import org.json.JSONObject;
 
 import java.awt.*;
-import java.awt.event.WindowEvent;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.text.NumberFormat;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
 
 @SuppressWarnings("unchecked")
 public class Controller {
@@ -113,7 +110,7 @@ public class Controller {
 
     @FXML
     public void initialize() {
-        Log("Corvus v0.1 started - Made by 'Heaven. and SrFairyox");
+        Log("Corvus v0.2 started - Made by 'Heaven. and SrFairyox");
         tpSessionIDLogin.setCollapsible(false);
         tpGeneralSettings.setCollapsible(false);
 
@@ -264,15 +261,11 @@ public void btnStartOnClick(ActionEvent actionEvent) {
     }
 
     private synchronized void InitializeGuiAsync() {
-        Platform.runLater(() -> {
-            Log("Initializing gui...");
-            Log("Reading Galaxy Gates...");
-        });
+        Log("Initializing gui...");
+        Log("Reading Galaxy Gates...");
         account.ReadGatesAsync();
-        Platform.runLater(() -> {
-            UpdateGui();
-            Log("Initialization finished!");
-        });
+        UpdateGui();
+        Log("Initialization finished!");
     }
 
     private void UpdateGui() {
@@ -311,6 +304,11 @@ private synchronized void ExecuteSpinAsync() {
             if(chkBoxPlaceGateOnMap.isSelected()) {
                 if((currentGateA.prepared && currentGateA.isReady()) || (currentGateB.prepared && currentGateB.isReady()) || (currentGateG.prepared && currentGateG.isReady())) {
                     Log("Stopping gate mode. Can not get more parts.");
+                    try {
+                        Thread.sleep(3000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
                     return;
                 }
                 if(currentGateA.isReady() && !currentGateA.prepared){
@@ -329,13 +327,19 @@ private synchronized void ExecuteSpinAsync() {
                 if (currentGateA.isReady() || currentGateB.isReady() || currentGateG.isReady())
                 {
                     Log("Stopping gate mode. Can not get more parts.");
+                    try {
+                        Thread.sleep(3000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
                     return;
                 }
             }
         } else {
             if(chkBoxPlaceGateOnMap.isSelected()) {
                 if(currentGate.prepared && currentGate.isReady()) {
                     Log("Stopping gate mode. Can not get more parts.");
+                    Sleeping(3000);
                     return;
                 }
                 if(currentGate.isReady() && !currentGate.prepared) {
@@ -345,25 +349,34 @@ private synchronized void ExecuteSpinAsync() {
             } else {
                 if(currentGate.isReady()) {
                     Log("Stopping gate mode. Can not get more parts.");
+                    Sleeping(3000);
                     return;
                 }
             }
         }
 
         if(account.gateData.EnergyCost.Text > account.gateData.Money && account.gateData.Samples <= 0) {
             Log("Stopping gate mode. No Uridium/EE left");
+            Sleeping(3000);
+            //Sleep 30 seconds
             return;
         }
         if(account.gateData.Money <= Integer.parseInt(txtMinUridium.getText())) {
             Log("Stopping gate mode. Minimum Uridium reached");
+            Sleeping(3000);
+            //Sleep 30 seconds
             return;
         }
         if(chkBoxSpinOnlyEE.isSelected() && account.gateData.Samples <= 0) {
             Log("Stopping gate mode. No EE left");
+            Sleeping(3000);
+            //Sleep 30 seconds
             return;
         }
         if(!(account.gateData.EnergyCost.Text <= Integer.parseInt(txtMaxSpinCost.getText()))) {
             Log("Stopping gate mode. Max Spin Cost");
+            Sleeping(3000);
+            //Sleep 30 seconds
             return;
         }
 
@@ -406,6 +419,14 @@ private synchronized void ExecuteSpinAsync() {
         UpdateGui();
     }
 
+    private void Sleeping(int ms) {
+        try {
+            Thread.sleep(ms);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
     private synchronized void DoWork() {
         try {
             Log("Reading Galaxy Gates...");
@@ -489,6 +510,7 @@ public void Log(String text) {
                 txtAreaLog.appendText("["+ DateTimeFormatter.ofPattern("HH:mm:ss").format(OffsetDateTime.now()) +"] " +text+"\n");
             }
         });
+
         if(chkEnableDebugCMD.isSelected()) {
             System.out.println(text);
         }

diff --git a/src/main/java/com/srfairyox/Corvus/Main.java b/src/main/java/com/srfairyox/Corvus/Main.java
@@ -9,7 +9,6 @@
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
 
-import java.io.File;
 import java.io.IOException;
 
 public class Main extends Application {