AdlC/PicoLimbo
AdlC/PicoLimbo
1
0
Fork 0
mirror of https://github.com/Nan1t/NanoLimbo.git synced 2025-07-09 19:40:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from BoomEaro/fixes

Browse Source 
Ability to disable players list. Fixed server starting message for log level < 3
This commit is contained in:
Max 2022-01-30 13:04:46 +02:00 committed by GitHub
commit 416878d160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ru/nanit/limbo/configuration/LimboConfig.java
View File

@ -50,6 +50,7 @@ public final class LimboConfig {
private boolean useJoinMessage;
private boolean useBossBar;
private boolean useTitle;
private boolean usePlayerList;
private String brandName;
private String joinMessage;
private BossBar bossBar;
@ -86,6 +87,7 @@ public final class LimboConfig {
useJoinMessage = conf.node("joinMessage", "enable").getBoolean();
useBossBar = conf.node("bossBar", "enable").getBoolean();
useTitle = conf.node("title", "enable").getBoolean();
usePlayerList = conf.node("playerList").getBoolean();
if (useBrandName)
brandName = conf.node("brandName", "content").getString();
@ -187,6 +189,10 @@ public final class LimboConfig {
return useTitle;
}
public boolean isUsePlayerList() {
return usePlayerList;
}
public String getBrandName() {
return brandName;
}

11
src/main/java/ru/nanit/limbo/connection/ClientConnection.java
View File

@ -239,11 +239,20 @@ public class ClientConnection extends ChannelInboundHandlerAdapter {
writePacket(PACKET_JOIN_GAME);
writePacket(PACKET_PLAYER_ABILITIES);
writePacket(PACKET_PLAYER_POS);
if (clientVersion.moreOrEqual(Version.V1_17)) {
if (server.getConfig().isUsePlayerList()) {
writePacket(PACKET_PLAYER_INFO);
}
}
else {
writePacket(PACKET_PLAYER_INFO);
}
if (clientVersion.moreOrEqual(Version.V1_13)){
writePacket(PACKET_DECLARE_COMMANDS);
if (PACKET_PLUGIN_MESSAGE != null)
writePacket(PACKET_PLUGIN_MESSAGE);
}
@ -433,7 +442,9 @@ public class ClientConnection extends ChannelInboundHandlerAdapter {
PACKET_JOIN_GAME = PacketSnapshot.of(joinGame);
PACKET_PLAYER_ABILITIES = PacketSnapshot.of(playerAbilities);
PACKET_PLAYER_POS = PacketSnapshot.of(positionAndLook);
PACKET_PLAYER_INFO = PacketSnapshot.of(info);
PACKET_DECLARE_COMMANDS = PacketSnapshot.of(declareCommands);
if (server.getConfig().isUseBrandName()){

4
src/main/java/ru/nanit/limbo/server/LimboServer.java
View File

@ -67,8 +67,6 @@ public final class LimboServer {
config = new LimboConfig(Paths.get("./"));
config.load();
Logger.setLevel(config.getDebugLevel());
dimensionRegistry = new DimensionRegistry(this);
dimensionRegistry.load(config.getDimensionType());
connections = new Connections();
@ -82,6 +80,8 @@ public final class LimboServer {
Runtime.getRuntime().addShutdownHook(new Thread(this::stop, "NanoLimbo shutdown thread"));
Logger.info("Server started on %s", config.getAddress());
Logger.setLevel(config.getDebugLevel());
}
private void startBootstrap() {

3
src/main/resources/settings.yml
View File

@ -19,6 +19,9 @@ ping:
# Available dimensions: OVERWORLD, NETHER, THE_END
dimension: THE_END
# Whether to display the player in the player list
playerList: true
# Spawn position in the world
spawnPosition:
x: 0.0