diff --git a/src/main/java/net/minestom/server/MinecraftServer.java b/src/main/java/net/minestom/server/MinecraftServer.java index ecf65f995..eed4447e6 100644 --- a/src/main/java/net/minestom/server/MinecraftServer.java +++ b/src/main/java/net/minestom/server/MinecraftServer.java @@ -59,6 +59,7 @@ public class MinecraftServer { @Getter private final static Logger LOGGER = LoggerFactory.getLogger(MinecraftServer.class); + public static final String VERSION_NAME = "1.16.2"; public static final int PROTOCOL_VERSION = 751; // Threads @@ -89,7 +90,8 @@ public class MinecraftServer { private static final int MS_TO_SEC = 1000; public static final int TICK_MS = MS_TO_SEC / TICK_PER_SECOND; - @Getter @Setter + @Getter + @Setter private static boolean hardcoreLook = false; //Extras @@ -187,7 +189,7 @@ public class MinecraftServer { // Registry try { - ResourceGatherer.ensureResourcesArePresent("1.16.2", null); // TODO: provide a way to give a path override, probably via launch arguments? + ResourceGatherer.ensureResourcesArePresent(VERSION_NAME, null); // TODO: provide a way to give a path override, probably via launch arguments? } catch (IOException e) { LOGGER.error("An error happened during resource gathering. Minestom will attempt to load anyway, but things may not work, and crashes can happen.", e); } @@ -451,7 +453,7 @@ public class MinecraftServer { nettyServer.start(address, port); long t1 = -System.nanoTime(); pluginManager.loadPlugins(); - LOGGER.info("Plugins loaded in " + (t1+System.nanoTime())/1_000_000D + "ms"); + LOGGER.info("Plugins loaded in " + (t1 + System.nanoTime()) / 1_000_000D + "ms"); LOGGER.info("Minestom server started successfully."); } diff --git a/src/main/java/net/minestom/server/network/netty/codec/LegacyPingHandler.java b/src/main/java/net/minestom/server/network/netty/codec/LegacyPingHandler.java index ae1899a20..61b9aa1d4 100644 --- a/src/main/java/net/minestom/server/network/netty/codec/LegacyPingHandler.java +++ b/src/main/java/net/minestom/server/network/netty/codec/LegacyPingHandler.java @@ -132,10 +132,10 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter { private String formatResponse(int playerProtocol) { // todo server motd, online and slots final String motd = "Minestom"; - final String version = "1.16.2"; + final String version = MinecraftServer.VERSION_NAME; final int online = MinecraftServer.getConnectionManager().getOnlinePlayers().size(); final int max = 0; - final int protocol = MinecraftServer.PROTOCOL_VERSION; // 1.15.2 + final int protocol = MinecraftServer.PROTOCOL_VERSION; if (playerProtocol == -2) { return String.format( diff --git a/src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java b/src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java index 3fd43bd67..39a52d3fb 100644 --- a/src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java +++ b/src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java @@ -17,7 +17,7 @@ public class StatusRequestPacket implements ClientPreplayPacket { ResponseData responseData = new ResponseData(); // Fill default params - responseData.setName("1.16.2"); + responseData.setName(MinecraftServer.VERSION_NAME); responseData.setProtocol(MinecraftServer.PROTOCOL_VERSION); responseData.setMaxPlayer(0); responseData.setOnline(0);