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

Fixed playerlist for 1.16.5 clients. Changed version string

Browse Source
This commit is contained in:
Nanit 2022-02-07 14:39:08 +02:00
parent 021d0a18a5
commit e1445c006b
4 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -4,7 +4,7 @@ plugins {
} }
group 'ru.nanit' group 'ru.nanit'
version '1.3.3' version '1.3.4'
repositories { repositories {
mavenCentral() mavenCentral()

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

@ -94,6 +94,7 @@ public final class LimboConfig {
useBossBar = conf.node("bossBar", "enable").getBoolean(); useBossBar = conf.node("bossBar", "enable").getBoolean();
useTitle = conf.node("title", "enable").getBoolean(); useTitle = conf.node("title", "enable").getBoolean();
usePlayerList = conf.node("playerList", "enable").getBoolean(); usePlayerList = conf.node("playerList", "enable").getBoolean();
playerListUsername = conf.node("playerList", "username").getString();
useHeaderAndFooter = conf.node("headerAndFooter", "enable").getBoolean(); useHeaderAndFooter = conf.node("headerAndFooter", "enable").getBoolean();
if (useBrandName) if (useBrandName)
@ -108,9 +109,6 @@ public final class LimboConfig {
if (useTitle) if (useTitle)
title = conf.node("title").get(Title.class); title = conf.node("title").get(Title.class);
if (usePlayerList)
playerListUsername = conf.node("playerList", "username").getString();
if (useHeaderAndFooter) { if (useHeaderAndFooter) {
playerListHeader = Colors.of(conf.node("headerAndFooter", "header").getString()); playerListHeader = Colors.of(conf.node("headerAndFooter", "header").getString());
playerListFooter = Colors.of(conf.node("headerAndFooter", "footer").getString()); playerListFooter = Colors.of(conf.node("headerAndFooter", "footer").getString());

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

@ -241,10 +241,10 @@ public class ClientConnection extends ChannelInboundHandlerAdapter {
writePacket(PACKET_PLAYER_ABILITIES); writePacket(PACKET_PLAYER_ABILITIES);
writePacket(PACKET_PLAYER_POS); writePacket(PACKET_PLAYER_POS);
if (PACKET_PLAYER_INFO != null && !clientVersion.equals(Version.V1_16_4)) if (server.getConfig().isUsePlayerList() || clientVersion.equals(Version.V1_16_4))
writePacket(PACKET_PLAYER_INFO); writePacket(PACKET_PLAYER_INFO);
if (clientVersion.moreOrEqual(Version.V1_13)){ if (clientVersion.moreOrEqual(Version.V1_13)) {
writePacket(PACKET_DECLARE_COMMANDS); writePacket(PACKET_DECLARE_COMMANDS);
if (PACKET_PLUGIN_MESSAGE != null) if (PACKET_PLUGIN_MESSAGE != null)
@ -430,26 +430,24 @@ public class ClientConnection extends ChannelInboundHandlerAdapter {
PacketDeclareCommands declareCommands = new PacketDeclareCommands(); PacketDeclareCommands declareCommands = new PacketDeclareCommands();
declareCommands.setCommands(Collections.emptyList()); declareCommands.setCommands(Collections.emptyList());
PacketPlayerInfo info = new PacketPlayerInfo();
info.setUsername(server.getConfig().getPlayerListUsername());
info.setGameMode(server.getConfig().getGameMode());
info.setUuid(uuid);
PACKET_LOGIN_SUCCESS = PacketSnapshot.of(loginSuccess); PACKET_LOGIN_SUCCESS = PacketSnapshot.of(loginSuccess);
PACKET_JOIN_GAME = PacketSnapshot.of(joinGame); PACKET_JOIN_GAME = PacketSnapshot.of(joinGame);
PACKET_PLAYER_ABILITIES = PacketSnapshot.of(playerAbilities); PACKET_PLAYER_ABILITIES = PacketSnapshot.of(playerAbilities);
PACKET_PLAYER_POS = PacketSnapshot.of(positionAndLook); PACKET_PLAYER_POS = PacketSnapshot.of(positionAndLook);
PACKET_PLAYER_INFO = PacketSnapshot.of(info);
PACKET_DECLARE_COMMANDS = PacketSnapshot.of(declareCommands); PACKET_DECLARE_COMMANDS = PacketSnapshot.of(declareCommands);
if (server.getConfig().isUsePlayerList()) { if (server.getConfig().isUseHeaderAndFooter()) {
PacketPlayerInfo info = new PacketPlayerInfo(); PacketPlayerListHeader header = new PacketPlayerListHeader();
info.setUsername(server.getConfig().getPlayerListUsername()); header.setHeader(server.getConfig().getPlayerListHeader());
info.setGameMode(server.getConfig().getGameMode()); header.setFooter(server.getConfig().getPlayerListFooter());
info.setUuid(uuid); PACKET_HEADER_AND_FOOTER = PacketSnapshot.of(header);
PACKET_PLAYER_INFO = PacketSnapshot.of(info);
if (server.getConfig().isUseHeaderAndFooter()) {
PacketPlayerListHeader header = new PacketPlayerListHeader();
header.setHeader(server.getConfig().getPlayerListHeader());
header.setFooter(server.getConfig().getPlayerListFooter());
PACKET_HEADER_AND_FOOTER = PacketSnapshot.of(header);
}
} }
if (server.getConfig().isUseBrandName()){ if (server.getConfig().isUseBrandName()){

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

@ -20,12 +20,12 @@ ping:
dimension: THE_END dimension: THE_END
# Whether to display the player in the player list # Whether to display the player in the player list
# For 1.16.5 clients player list will be sent even if disabled, to avoid crash
playerList: playerList:
enable: false enable: false
username: 'NanoLimbo' username: 'NanoLimbo'
# Whether to display header and footer in player list # Whether to display header and footer in player list
# Enable it only if you enabled playerList
headerAndFooter: headerAndFooter:
enable: false enable: false
header: '{"text": "&eWelcome!"}' header: '{"text": "&eWelcome!"}'