From 3e47c8ef066f4e583c6ad215da97971c0c35d5fa Mon Sep 17 00:00:00 2001 From: Melledy <121644117+Melledy@users.noreply.github.com> Date: Thu, 27 Nov 2025 19:25:40 -0800 Subject: [PATCH] Cleanup + Bump version to `1.1.0` --- build.gradle | 2 +- src/main/java/emu/nebula/Nebula.java | 2 +- .../emu/nebula/game/tower/StarTowerGame.java | 1 - .../java/emu/nebula/server/HttpServer.java | 22 ++++++++++++------- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index f5a35e2..d3a9a26 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ java { } } -version = '1.0.1' +version = '1.1.0' var shouldGenerateProto = System.getenv("GENERATE_PROTO") == "true" System.out.println(shouldGenerateProto ? "Generating proto files" : "Skipping proto generation") diff --git a/src/main/java/emu/nebula/Nebula.java b/src/main/java/emu/nebula/Nebula.java index 45706c7..91f70d9 100644 --- a/src/main/java/emu/nebula/Nebula.java +++ b/src/main/java/emu/nebula/Nebula.java @@ -109,7 +109,7 @@ public class Nebula { // Start servers try { - // Always run http server as it is needed by for dispatch and gateserver + // Always run http server as it is needed by for login and game server httpServer = new HttpServer(serverType); httpServer.start(); } catch (Exception exception) { diff --git a/src/main/java/emu/nebula/game/tower/StarTowerGame.java b/src/main/java/emu/nebula/game/tower/StarTowerGame.java index 7303574..ad2f98a 100644 --- a/src/main/java/emu/nebula/game/tower/StarTowerGame.java +++ b/src/main/java/emu/nebula/game/tower/StarTowerGame.java @@ -6,7 +6,6 @@ import java.util.List; import dev.morphia.annotations.Entity; import emu.nebula.GameConstants; -import emu.nebula.Nebula; import emu.nebula.data.GameData; import emu.nebula.data.resources.PotentialDef; import emu.nebula.data.resources.StarTowerDef; diff --git a/src/main/java/emu/nebula/server/HttpServer.java b/src/main/java/emu/nebula/server/HttpServer.java index c288b5a..141e455 100644 --- a/src/main/java/emu/nebula/server/HttpServer.java +++ b/src/main/java/emu/nebula/server/HttpServer.java @@ -50,15 +50,15 @@ public class HttpServer { } private HttpConnectionFactory getHttpFactory() { - HttpConfiguration httpsConfig = new HttpConfiguration(); - SecureRequestCustomizer src = new SecureRequestCustomizer(); + var httpsConfig = new HttpConfiguration(); + var src = new SecureRequestCustomizer(); src.setSniHostCheck(false); httpsConfig.addCustomizer(src); return new HttpConnectionFactory(httpsConfig); } private SslContextFactory.Server getSSLContextFactory() { - SslContextFactory.Server sslContextFactory = new SslContextFactory.Server(); + var sslContextFactory = new SslContextFactory.Server(); sslContextFactory.setKeyStorePath(Nebula.getConfig().getKeystore().getPath()); sslContextFactory.setKeyStorePassword(Nebula.getConfig().getKeystore().getPassword()); sslContextFactory.setSniRequired(false); @@ -102,23 +102,29 @@ public class HttpServer { // Start server public void start() { - if (this.started) + if (this.started) { return; + } + this.started = true; // Http server if (getServerConfig().isUseSSL()) { - ServerConnector sslConnector = new ServerConnector(getApp().jettyServer().server(), getSSLContextFactory(), - getHttpFactory()); + ServerConnector sslConnector = new ServerConnector(getApp().jettyServer().server(), getSSLContextFactory(), getHttpFactory()); sslConnector.setHost(getServerConfig().getBindAddress()); sslConnector.setPort(getServerConfig().getBindPort()); getApp().jettyServer().server().addConnector(sslConnector); - getApp().start(); } else { getApp().start(getServerConfig().getBindAddress(), getServerConfig().getBindPort()); } - + + if (type.runGame()) { + Nebula.getLogger().info("Nebula PS is free server software."); + Nebula.getLogger().info("Github: https://github.com/Melledy/Nebula"); + Nebula.getLogger().info("Discord: https://discord.gg/cskCWBqdJk"); + } + // Done Nebula.getLogger().info("Http Server started on " + getServerConfig().getBindPort()); }