1.0.3

syd711 · Sep 21, 2022 · 7fde926 · 7fde926
1 parent 39ede88
commit 7fde926
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/resources/overlay.jpg b/resources/overlay.jpg
diff --git a/src/main/java/de/mephisto/vpin/extensions/ServiceRunner.java b/src/main/java/de/mephisto/vpin/extensions/ServiceRunner.java
@@ -2,11 +2,11 @@
 
 import de.mephisto.vpin.GameInfo;
 import de.mephisto.vpin.VPinService;
+import de.mephisto.vpin.extensions.generator.HighscoreCardGenerator;
 import de.mephisto.vpin.extensions.generator.OverlayGenerator;
 import de.mephisto.vpin.extensions.util.Config;
 import de.mephisto.vpin.popper.TableStatusChangeListener;
 import de.mephisto.vpin.popper.TableStatusChangedEvent;
-import de.mephisto.vpin.extensions.generator.HighscoreCardGenerator;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,15 +19,21 @@ public ServiceRunner() {
     service = VPinService.create(true);
     LOG.info("ServiceRunner started.");
 
-
     LOG.info("Added VPin service listener for highscore changes.");
     service.addTableStatusChangeListener(this);
 
     String targetScreen = Config.getCardGeneratorConfig().get("popper.screen");
-    if(StringUtils.isEmpty(targetScreen)) {
+    if (StringUtils.isEmpty(targetScreen)) {
       LOG.info("Skipped starting highscore card generator, no PinUP popper target screen configured.");
     }
 
+    try {
+      LOG.info("Executing highscore overlay generation.");
+      OverlayGenerator.generateOverlay(service);
+    } catch (Exception e) {
+      LOG.error("Initial overlay generation failed: " + e.getMessage(), e);
+    }
+
     LOG.info("Overlay window listener started.");
     OverlayWindowFX.launch(OverlayWindowFX.class);
   }
@@ -41,7 +47,7 @@ public void tableLaunched(TableStatusChangedEvent tableStatusChangedEvent) {
   public void tableExited(TableStatusChangedEvent tableStatusChangedEvent) {
     try {
       String targetScreen = Config.getCardGeneratorConfig().get("popper.screen");
-      if(StringUtils.isEmpty(targetScreen)) {
+      if (StringUtils.isEmpty(targetScreen)) {
         GameInfo gameInfo = tableStatusChangedEvent.getGameInfo();
         LOG.info("Executing highscore card generation for '" + gameInfo + "'");
         HighscoreCardGenerator.generateCard(gameInfo);

diff --git a/src/main/java/de/mephisto/vpin/extensions/generator/OverlayGenerator.java b/src/main/java/de/mephisto/vpin/extensions/generator/OverlayGenerator.java
@@ -20,7 +20,6 @@ public class OverlayGenerator extends GraphicsGenerator {
   public static void main(String[] args) throws Exception {
     VPinService service = VPinService.create(false);
     generateOverlay(service);
-    service.shutdown();
   }
 
   public static void generateOverlay(VPinService service) throws Exception {

diff --git a/src/main/java/de/mephisto/vpin/extensions/generator/OverlayGraphics.java b/src/main/java/de/mephisto/vpin/extensions/generator/OverlayGraphics.java
@@ -155,7 +155,7 @@ private static void renderHighscoreList(BufferedImage image, GameInfo gameOfTheM
     int yStart = highscoreListYOffset + ROW_SEPARATOR + TITLE_FONT_SIZE / 2;
 
     List<GameInfo> gameInfos = service.getGameInfos();
-    gameInfos.sort((o1, o2) -> (int) (o2.getLastPlayed().getTime() - o1.getLastPlayed().getTime()));
+    gameInfos.sort((o1, o2) -> (int) (o2.getLastPlayedTime() - o1.getLastPlayedTime()));
 
     for (GameInfo game : gameInfos) {
       Highscore highscore = game.resolveHighscore();