refactoring

Author: stone-alex

app/src/main/java/elite/intel/gameapi/journal/subscribers/FSDJumpSubscriber.java

@@ -3,7 +3,6 @@
 import com.google.common.eventbus.Subscribe;
 import elite.intel.ai.search.edsm.EdsmApiClient;
 import elite.intel.ai.search.edsm.dto.DeathsDto;
-import elite.intel.ai.search.edsm.dto.StarSystemDto;
 import elite.intel.ai.search.edsm.dto.TrafficDto;
 import elite.intel.ai.search.edsm.dto.data.DeathsStats;
 import elite.intel.ai.search.edsm.dto.data.TrafficStats;
@@ -15,10 +14,11 @@
 import elite.intel.session.PlayerSession;
 import elite.intel.util.AdjustRoute;
 
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import static elite.intel.util.StringUtls.isFuelStarClause;
+
 @SuppressWarnings("unused")
 public class FSDJumpSubscriber {
 
@@ -43,6 +43,7 @@ public void onFSDJumpEvent(FSDJumpEvent event) {
         currentLocation.setPowerplayStateControlProgress(event.getPowerplayStateControlProgress());
         currentLocation.setPowerplayStateReinforcement(event.getPowerplayStateReinforcement());
         currentLocation.setPowerplayStateUndermining(event.getPowerplayStateUndermining());
+        playerSession.setCurrentLocation(currentLocation);
 
         String finalDestination = String.valueOf(playerSession.get(PlayerSession.FINAL_DESTINATION));
         String arrivedAt = String.valueOf(playerSession.get(PlayerSession.JUMPING_TO));
@@ -68,23 +69,27 @@ public void onFSDJumpEvent(FSDJumpEvent event) {
             }
             currentLocation.setTrafficDto(trafficDto);
             currentLocation.setDeathsDto(deathsDto);
-
-        } else {
-            if (roueSet) {
-                Map<Integer, NavRouteDto> adjustedRoute = AdjustRoute.adjustRoute(orderedRoute);
-                playerSession.setNavRoute(adjustedRoute);
-                int remainingJump = adjustedRoute.size();
-                if (remainingJump > 0) {
-                    orderedRoute.stream().findFirst().ifPresent(
-                            nextStop -> sb.append(" Next stop: ").append(nextStop.toJson()).append(", ")
-                    );
-                }
-
-                sb.append(remainingJump).append(" jumps remaining: ").append(" to ").append(finalDestination).append(".");
+            playerSession.setCurrentLocation(currentLocation);
+        } else if (roueSet) {
+            Map<Integer, NavRouteDto> adjustedRoute = AdjustRoute.adjustRoute(orderedRoute);
+            playerSession.setNavRoute(adjustedRoute);
+            int remainingJump = adjustedRoute.size();
+            if (remainingJump > 0) {
+                orderedRoute.stream().findFirst().ifPresent(
+                        nextStop -> sb
+                                .append(" Next stop: ")
+                                .append(nextStop.getName())
+                                .append(". ")
+                                .append("Star Class: ")
+                                .append(nextStop.getStarClass())
+                                .append(", ")
+                                .append(isFuelStarClause(nextStop.getStarClass()))
+                );
             }
+
+            sb.append(remainingJump).append(" jumps remaining: ").append(" to ").append(finalDestination).append(".");
         }
 
-        playerSession.setCurrentLocation(currentLocation);
         EventBusManager.publish(new SensorDataEvent(sb.toString()));
     }
 }

app/src/main/java/elite/intel/gameapi/journal/subscribers/StartJumpSubscriber.java

@@ -8,6 +8,8 @@
 import elite.intel.session.PlayerSession;
 import elite.intel.ui.event.AppLogEvent;
 
+import static elite.intel.util.StringUtls.isFuelStarClause;
+
 @SuppressWarnings("unused")
 public class StartJumpSubscriber {
 
@@ -43,11 +45,4 @@ public void onStartJumpEvent(StartJumpEvent event) {
 
     }
 
-    private String isFuelStarClause(String starClass) {
-        if (starClass == null) {
-            return "";
-        }
-        boolean isFuelStar = "KGBFOAM".contains(starClass);
-        return isFuelStar ? " Fuel Star" : " Warning! - Not a Fuel Star!";
-    }
 }

app/src/main/java/elite/intel/util/StringUtls.java

@@ -31,4 +31,14 @@ public static String capitalizeWords(String input) {
 
         return result.toString();
     }
+
+
+    public static String isFuelStarClause(String starClass) {
+        if (starClass == null) {
+            return "";
+        }
+        boolean isFuelStar = "KGBFOAM".contains(starClass);
+        return isFuelStar ? " Fuel Star" : " Warning! - Not a Fuel Star!";
+    }
+
 }