From 6eadc42b278908654df477d82eff19bc727d23a0 Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Thu, 9 Apr 2026 22:55:11 -0700
Subject: [PATCH] Update data versions and cleanup some stuff

---
 src/main/java/emu/nebula/Nebula.java                   |  6 +++---
 src/main/java/emu/nebula/game/GameContext.java         |  2 +-
 .../nebula/game/activity/type/PenguinCardActivity.java |  9 ++-------
 .../handlers/HandlerActivityPenguinCardSettleReq.java  |  1 -
 src/main/resources/versions.json                       | 10 +++++-----
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/main/java/emu/nebula/Nebula.java b/src/main/java/emu/nebula/Nebula.java
index c1c088c..84521db 100644
--- a/src/main/java/emu/nebula/Nebula.java
+++ b/src/main/java/emu/nebula/Nebula.java
@@ -196,11 +196,11 @@ public class Nebula {
         var file = new File("./versions.json");
         
         if (file.exists()) {
-            // Load data versions from an external file first, in case the internal versions.json is out of date
+            // Try and load data versions from an external file first, in case the internal versions.json is out of date
             try (FileReader reader = new FileReader(file)) {
                 versions = JsonUtils.loadToMap(reader, String.class, Integer.class);
             } catch (Exception e) {
-                // Ignored
+                // Ignored - Try using internal versions.json next
             }
         }
         
@@ -209,7 +209,7 @@ public class Nebula {
             try (var stream = Nebula.class.getResourceAsStream("/versions.json"); var reader = new InputStreamReader(stream)) {
                 versions = JsonUtils.loadToMap(reader, String.class, Integer.class);
             } catch (Exception e) {
-                // Ignored
+                // Internal versions.json not loaded for reason
             }
         }
         
diff --git a/src/main/java/emu/nebula/game/GameContext.java b/src/main/java/emu/nebula/game/GameContext.java
index fe0581d..02cc60a 100644
--- a/src/main/java/emu/nebula/game/GameContext.java
+++ b/src/main/java/emu/nebula/game/GameContext.java
@@ -44,6 +44,7 @@ public class GameContext implements Runnable {
     private int epochMonths;
     
     public GameContext() {
+        // Create session map
         this.sessions = new Object2ObjectOpenHashMap<>();
         
         // Setup game modules
@@ -85,7 +86,6 @@ public class GameContext implements Runnable {
         this.sessions.put(session.getToken(), session);
     }
     
-    // TODO add timeout to config
     public synchronized void cleanupInactiveSessions() {
         var it = this.getSessions().entrySet().iterator();
         
diff --git a/src/main/java/emu/nebula/game/activity/type/PenguinCardActivity.java b/src/main/java/emu/nebula/game/activity/type/PenguinCardActivity.java
index ce21d07..e9d95b4 100644
--- a/src/main/java/emu/nebula/game/activity/type/PenguinCardActivity.java
+++ b/src/main/java/emu/nebula/game/activity/type/PenguinCardActivity.java
@@ -1,20 +1,20 @@
 package emu.nebula.game.activity.type;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import dev.morphia.annotations.Entity;
 
-import emu.nebula.data.GameData;
 import emu.nebula.data.resources.ActivityDef;
 import emu.nebula.game.activity.ActivityManager;
 import emu.nebula.game.activity.GameActivity;
 import emu.nebula.proto.ActivityDetail.ActivityMsg;
 import emu.nebula.proto.Public.ActivityPenguinCardLevel;
 import emu.nebula.proto.Public.ActivityQuest;
+
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -79,11 +79,6 @@ public class PenguinCardActivity extends GameActivity {
     public static class LevelStats {
         private int stars;
         private int score;
-
-        @Deprecated
-        public LevelStats() {
-
-        }
     }
 
 }
diff --git a/src/main/java/emu/nebula/server/handlers/HandlerActivityPenguinCardSettleReq.java b/src/main/java/emu/nebula/server/handlers/HandlerActivityPenguinCardSettleReq.java
index 9d16673..b162f8b 100644
--- a/src/main/java/emu/nebula/server/handlers/HandlerActivityPenguinCardSettleReq.java
+++ b/src/main/java/emu/nebula/server/handlers/HandlerActivityPenguinCardSettleReq.java
@@ -3,7 +3,6 @@ package emu.nebula.server.handlers;
 import emu.nebula.net.NetHandler;
 import emu.nebula.net.NetMsgId;
 import emu.nebula.proto.ActivityPenguinCardLevelSettle.ActivityPenguinCardSettleReq;
-import it.unimi.dsi.fastutil.ints.IntList;
 import emu.nebula.net.HandlerId;
 import emu.nebula.game.activity.type.PenguinCardActivity;
 import emu.nebula.game.activity.type.PenguinCardActivity.LevelStats;
diff --git a/src/main/resources/versions.json b/src/main/resources/versions.json
index 1738b33..80ea44b 100644
--- a/src/main/resources/versions.json
+++ b/src/main/resources/versions.json
@@ -1,7 +1,7 @@
 {
-  "global": 96,
-  "kr": 101,
-  "jp": 99,
-  "tw": 106,
-  "cn": 97
+  "global": 98,
+  "kr": 103,
+  "jp": 101,
+  "tw": 108,
+  "cn": 99
 }
\ No newline at end of file