Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-06-26 06:24:54 +02:00
Code Issues Projects Releases Wiki Activity

Stop hardcoding version name

Browse Source
This commit is contained in:
Felix Cravic 2020-08-16 10:57:27 +02:00
parent 414fb06407
commit 737cf24ace
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minestom/server/MinecraftServer.java
View File

@ -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.");
}

4
src/main/java/net/minestom/server/network/netty/codec/LegacyPingHandler.java
View File

@ -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(

2
src/main/java/net/minestom/server/network/packet/client/status/StatusRequestPacket.java
View File

@ -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);