Update data versions and cleanup some stuff

This commit is contained in:
Melledy
2026-04-09 22:55:11 -07:00
parent 73d3cdee35
commit 6eadc42b27
5 changed files with 11 additions and 17 deletions
+3 -3
View File
@@ -196,11 +196,11 @@ public class Nebula {
var file = new File("./versions.json"); var file = new File("./versions.json");
if (file.exists()) { 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)) { try (FileReader reader = new FileReader(file)) {
versions = JsonUtils.loadToMap(reader, String.class, Integer.class); versions = JsonUtils.loadToMap(reader, String.class, Integer.class);
} catch (Exception e) { } 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)) { try (var stream = Nebula.class.getResourceAsStream("/versions.json"); var reader = new InputStreamReader(stream)) {
versions = JsonUtils.loadToMap(reader, String.class, Integer.class); versions = JsonUtils.loadToMap(reader, String.class, Integer.class);
} catch (Exception e) { } catch (Exception e) {
// Ignored // Internal versions.json not loaded for reason
} }
} }
@@ -44,6 +44,7 @@ public class GameContext implements Runnable {
private int epochMonths; private int epochMonths;
public GameContext() { public GameContext() {
// Create session map
this.sessions = new Object2ObjectOpenHashMap<>(); this.sessions = new Object2ObjectOpenHashMap<>();
// Setup game modules // Setup game modules
@@ -85,7 +86,6 @@ public class GameContext implements Runnable {
this.sessions.put(session.getToken(), session); this.sessions.put(session.getToken(), session);
} }
// TODO add timeout to config
public synchronized void cleanupInactiveSessions() { public synchronized void cleanupInactiveSessions() {
var it = this.getSessions().entrySet().iterator(); var it = this.getSessions().entrySet().iterator();
@@ -1,20 +1,20 @@
package emu.nebula.game.activity.type; package emu.nebula.game.activity.type;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import dev.morphia.annotations.Entity; import dev.morphia.annotations.Entity;
import emu.nebula.data.GameData;
import emu.nebula.data.resources.ActivityDef; import emu.nebula.data.resources.ActivityDef;
import emu.nebula.game.activity.ActivityManager; import emu.nebula.game.activity.ActivityManager;
import emu.nebula.game.activity.GameActivity; import emu.nebula.game.activity.GameActivity;
import emu.nebula.proto.ActivityDetail.ActivityMsg; import emu.nebula.proto.ActivityDetail.ActivityMsg;
import emu.nebula.proto.Public.ActivityPenguinCardLevel; import emu.nebula.proto.Public.ActivityPenguinCardLevel;
import emu.nebula.proto.Public.ActivityQuest; import emu.nebula.proto.Public.ActivityQuest;
import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@@ -79,11 +79,6 @@ public class PenguinCardActivity extends GameActivity {
public static class LevelStats { public static class LevelStats {
private int stars; private int stars;
private int score; private int score;
@Deprecated
public LevelStats() {
}
} }
} }
@@ -3,7 +3,6 @@ package emu.nebula.server.handlers;
import emu.nebula.net.NetHandler; import emu.nebula.net.NetHandler;
import emu.nebula.net.NetMsgId; import emu.nebula.net.NetMsgId;
import emu.nebula.proto.ActivityPenguinCardLevelSettle.ActivityPenguinCardSettleReq; import emu.nebula.proto.ActivityPenguinCardLevelSettle.ActivityPenguinCardSettleReq;
import it.unimi.dsi.fastutil.ints.IntList;
import emu.nebula.net.HandlerId; import emu.nebula.net.HandlerId;
import emu.nebula.game.activity.type.PenguinCardActivity; import emu.nebula.game.activity.type.PenguinCardActivity;
import emu.nebula.game.activity.type.PenguinCardActivity.LevelStats; import emu.nebula.game.activity.type.PenguinCardActivity.LevelStats;
+5 -5
View File
@@ -1,7 +1,7 @@
{ {
"global": 96, "global": 98,
"kr": 101, "kr": 103,
"jp": 99, "jp": 101,
"tw": 106, "tw": 108,
"cn": 97 "cn": 99
} }