diff --git a/src/main/java/ru/nanit/limbo/LimboConstants.java b/src/main/java/ru/nanit/limbo/LimboConstants.java index 3e1653f..a4f7929 100644 --- a/src/main/java/ru/nanit/limbo/LimboConstants.java +++ b/src/main/java/ru/nanit/limbo/LimboConstants.java @@ -4,6 +4,6 @@ public final class LimboConstants { public static final String VELOCITY_INFO_CHANNEL = "velocity:player_info"; - private LimboConstants(){} + private LimboConstants() {} } diff --git a/src/main/java/ru/nanit/limbo/NanoLimbo.java b/src/main/java/ru/nanit/limbo/NanoLimbo.java index a68c977..313ae36 100644 --- a/src/main/java/ru/nanit/limbo/NanoLimbo.java +++ b/src/main/java/ru/nanit/limbo/NanoLimbo.java @@ -5,10 +5,10 @@ import ru.nanit.limbo.util.Logger; public final class NanoLimbo { - public static void main(String[] args){ + public static void main(String[] args) { try { new LimboServer().start(); - } catch (Exception e){ + } catch (Exception e) { Logger.error("Cannot start server: ", e); } } diff --git a/src/main/java/ru/nanit/limbo/configuration/LimboConfig.java b/src/main/java/ru/nanit/limbo/configuration/LimboConfig.java index 3acbb52..ae3ba17 100644 --- a/src/main/java/ru/nanit/limbo/configuration/LimboConfig.java +++ b/src/main/java/ru/nanit/limbo/configuration/LimboConfig.java @@ -38,7 +38,7 @@ public final class LimboConfig { private int bossGroupSize; private int workerGroupSize; - public LimboConfig(Path root){ + public LimboConfig(Path root) { this.root = root; } diff --git a/src/main/java/ru/nanit/limbo/configuration/SocketAddressSerializer.java b/src/main/java/ru/nanit/limbo/configuration/SocketAddressSerializer.java index 96520c3..613f9c2 100644 --- a/src/main/java/ru/nanit/limbo/configuration/SocketAddressSerializer.java +++ b/src/main/java/ru/nanit/limbo/configuration/SocketAddressSerializer.java @@ -17,7 +17,7 @@ public class SocketAddressSerializer implements TypeSerializer { int port = node.node("port").getInt(); SocketAddress address; - if (ip == null || ip.isEmpty()){ + if (ip == null || ip.isEmpty()) { address = new InetSocketAddress(port); } else { address = new InetSocketAddress(ip, port); diff --git a/src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java b/src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java index 5b3cd7a..4ffc47e 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java +++ b/src/main/java/ru/nanit/limbo/connection/ClientChannelInitializer.java @@ -16,7 +16,7 @@ public class ClientChannelInitializer extends ChannelInitializer { private final LimboServer server; - public ClientChannelInitializer(LimboServer server){ + public ClientChannelInitializer(LimboServer server) { this.server = server; } diff --git a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java index eba80ea..e43c2fd 100644 --- a/src/main/java/ru/nanit/limbo/connection/ClientConnection.java +++ b/src/main/java/ru/nanit/limbo/connection/ClientConnection.java @@ -53,7 +53,7 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { private int velocityLoginMessageId = -1; - public ClientConnection(Channel channel, LimboServer server){ + public ClientConnection(Channel channel, LimboServer server) { this.server = server; this.channel = channel; this.address = channel.remoteAddress(); @@ -64,7 +64,7 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { return gameProfile.getUuid(); } - public String getUsername(){ + public String getUsername() { return gameProfile.getUsername(); } @@ -74,7 +74,7 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { @Override public void channelInactive(ChannelHandlerContext ctx) throws Exception { - if (state.equals(State.PLAY)){ + if (state.equals(State.PLAY)) { server.getConnections().removeConnection(this); } super.channelInactive(ctx); @@ -82,7 +82,7 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - if (channel.isActive()){ + if (channel.isActive()) { Logger.error("Unhandled exception: ", cause); } } @@ -92,17 +92,17 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { handlePacket(msg); } - public void handlePacket(Object packet){ - if (packet instanceof PacketHandshake){ + public void handlePacket(Object packet) { + if (packet instanceof PacketHandshake) { PacketHandshake handshake = (PacketHandshake) packet; clientVersion = handshake.getVersion(); updateState(State.getById(handshake.getNextState())); Logger.debug("Pinged from " + address); - if (server.getConfig().getInfoForwarding().isLegacy()){ + if (server.getConfig().getInfoForwarding().isLegacy()) { String[] split = handshake.getHost().split("\00"); - if (split.length == 3 || split.length == 4){ + if (split.length == 3 || split.length == 4) { setAddress(split[1]); gameProfile.setUuid(UuidUtil.fromString(split[2])); } else { @@ -112,28 +112,28 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { return; } - if (packet instanceof PacketStatusRequest){ + if (packet instanceof PacketStatusRequest) { sendPacket(new PacketStatusResponse(server)); return; } - if (packet instanceof PacketStatusPing){ + if (packet instanceof PacketStatusPing) { sendPacketAndClose(packet); return; } - if (packet instanceof PacketLoginStart){ - if (server.getConnections().getCount() >= server.getConfig().getMaxPlayers()){ + if (packet instanceof PacketLoginStart) { + if (server.getConnections().getCount() >= server.getConfig().getMaxPlayers()) { disconnectLogin("Too many players connected"); return; } - if (!clientVersion.equals(Version.getCurrentSupported())){ + if (!clientVersion.equals(Version.getCurrentSupported())) { disconnectLogin("Incompatible client version"); return; } - if (server.getConfig().getInfoForwarding().isModern()){ + if (server.getConfig().getInfoForwarding().isModern()) { velocityLoginMessageId = ThreadLocalRandom.current().nextInt(0, Integer.MAX_VALUE); PacketLoginPluginRequest request = new PacketLoginPluginRequest(); request.setMessageId(velocityLoginMessageId); @@ -143,7 +143,7 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { return; } - if (!server.getConfig().getInfoForwarding().isModern()){ + if (!server.getConfig().getInfoForwarding().isModern()) { gameProfile.setUsername(((PacketLoginStart)packet).getUsername()); gameProfile.setUuid(UuidUtil.getOfflineModeUuid(getUsername())); } @@ -152,13 +152,13 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { return; } - if (packet instanceof PacketLoginPluginResponse){ + if (packet instanceof PacketLoginPluginResponse) { PacketLoginPluginResponse response = (PacketLoginPluginResponse) packet; if (server.getConfig().getInfoForwarding().isModern() - && response.getMessageId() == velocityLoginMessageId){ + && response.getMessageId() == velocityLoginMessageId) { - if (!response.isSuccessful() || response.getData() == null){ + if (!response.isSuccessful() || response.getData() == null) { disconnectLogin("You need to connect with Velocity"); return; } @@ -178,8 +178,8 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { } } - private void fireLoginSuccess(){ - if (server.getConfig().getInfoForwarding().isModern() && velocityLoginMessageId == -1){ + private void fireLoginSuccess() { + if (server.getConfig().getInfoForwarding().isModern() && velocityLoginMessageId == -1) { disconnectLogin("You need to connect with Velocity"); return; } @@ -204,51 +204,51 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { sendKeepAlive(); } - public void disconnectLogin(String reason){ - if (isConnected() && state == State.LOGIN){ + public void disconnectLogin(String reason) { + if (isConnected() && state == State.LOGIN) { PacketDisconnect disconnect = new PacketDisconnect(); disconnect.setReason(reason); sendPacketAndClose(disconnect); } } - public void sendKeepAlive(){ - if (state.equals(State.PLAY)){ + public void sendKeepAlive() { + if (state.equals(State.PLAY)) { PacketKeepAlive keepAlive = new PacketKeepAlive(); keepAlive.setId(ThreadLocalRandom.current().nextLong()); sendPacket(keepAlive); } } - public void sendPacket(Object packet){ + public void sendPacket(Object packet) { if (isConnected()) channel.writeAndFlush(packet, channel.voidPromise()); } - public void sendPacketAndClose(Object packet){ + public void sendPacketAndClose(Object packet) { if (isConnected()) channel.writeAndFlush(packet).addListener(ChannelFutureListener.CLOSE); } - public void writePacket(Object packet){ + public void writePacket(Object packet) { if (isConnected()) channel.write(packet, channel.voidPromise()); } - public void flushPackets(){ + public void flushPackets() { if (isConnected()) channel.flush(); } - public boolean isConnected(){ + public boolean isConnected() { return channel.isActive(); } - private void updateState(State state){ + private void updateState(State state) { this.state = state; channel.pipeline().get(PacketDecoder.class).updateState(state); channel.pipeline().get(PacketEncoder.class).updateState(state); } - private void setAddress(String host){ + private void setAddress(String host) { this.address = new InetSocketAddress(host, ((InetSocketAddress)this.address).getPort()); } @@ -272,7 +272,7 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { return true; } - public static void preInitPackets(LimboServer server){ + public static void preInitPackets(LimboServer server) { final String username = server.getConfig().getPingData().getVersion(); final UUID uuid = UuidUtil.getOfflineModeUuid(username); @@ -325,7 +325,7 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { PACKET_PLAYER_INFO = PreEncodedPacket.of(info); PACKET_DECLARE_COMMANDS = PreEncodedPacket.of(declareCommands); - if (server.getConfig().isUseJoinMessage()){ + if (server.getConfig().isUseJoinMessage()) { PacketChatMessage joinMessage = new PacketChatMessage(); joinMessage.setJsonData(server.getConfig().getJoinMessage()); joinMessage.setPosition(PacketChatMessage.Position.CHAT); @@ -333,7 +333,7 @@ public class ClientConnection extends ChannelInboundHandlerAdapter { PACKET_JOIN_MESSAGE = PreEncodedPacket.of(joinMessage); } - if (server.getConfig().isUseBossBar()){ + if (server.getConfig().isUseBossBar()) { PacketBossBar bossBar = new PacketBossBar(); bossBar.setBossBar(server.getConfig().getBossBar()); bossBar.setUuid(UUID.randomUUID()); diff --git a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java index 5202447..75b0246 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketDecoder.java @@ -13,7 +13,7 @@ public class PacketDecoder extends MessageToMessageDecoder { private State.PacketRegistry mappings; - public PacketDecoder(){ + public PacketDecoder() { updateState(State.HANDSHAKING); } @@ -25,10 +25,10 @@ public class PacketDecoder extends MessageToMessageDecoder { int packetId = msg.readVarInt(); Packet packet = mappings.getPacket(packetId); - if (packet != null){ + if (packet != null) { try { packet.decode(msg); - } catch (Exception e){ + } catch (Exception e) { Logger.warning("Cannot decode packet 0x%s: %s", Integer.toHexString(packetId), e.getMessage()); } @@ -38,7 +38,7 @@ public class PacketDecoder extends MessageToMessageDecoder { } } - public void updateState(State state){ + public void updateState(State state) { this.mappings = state.serverBound; } } diff --git a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java index 05a3c84..e559144 100644 --- a/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java +++ b/src/main/java/ru/nanit/limbo/connection/pipeline/PacketEncoder.java @@ -13,7 +13,7 @@ public class PacketEncoder extends MessageToByteEncoder { private State.PacketRegistry registry; - public PacketEncoder(){ + public PacketEncoder() { updateState(State.HANDSHAKING); } @@ -24,13 +24,13 @@ public class PacketEncoder extends MessageToByteEncoder { ByteMessage msg = new ByteMessage(out); int packetId; - if (packet instanceof PreEncodedPacket){ + if (packet instanceof PreEncodedPacket) { packetId = registry.getPacketId(((PreEncodedPacket)packet).getWrappedPacket().getClass()); } else { packetId = registry.getPacketId(packet.getClass()); } - if (packetId == -1){ + if (packetId == -1) { Logger.warning("Undefined packet class: %s", packet.getClass().getName()); return; } @@ -39,12 +39,12 @@ public class PacketEncoder extends MessageToByteEncoder { try { packet.encode(msg); - } catch (Exception e){ + } catch (Exception e) { Logger.warning("Cannot encode packet 0x%s: %s", Integer.toHexString(packetId), e.getMessage()); } } - public void updateState(State state){ + public void updateState(State state) { this.registry = state.clientBound; } diff --git a/src/main/java/ru/nanit/limbo/protocol/ByteMessage.java b/src/main/java/ru/nanit/limbo/protocol/ByteMessage.java index 7c5eba1..a083704 100644 --- a/src/main/java/ru/nanit/limbo/protocol/ByteMessage.java +++ b/src/main/java/ru/nanit/limbo/protocol/ByteMessage.java @@ -23,11 +23,11 @@ public class ByteMessage extends ByteBuf { private final ByteBuf buf; - public ByteMessage(ByteBuf buf){ + public ByteMessage(ByteBuf buf) { this.buf = buf; } - public byte[] toByteArray(){ + public byte[] toByteArray() { byte[] bytes = new byte[buf.readableBytes()]; buf.readBytes(bytes); return bytes; @@ -50,7 +50,7 @@ public class ByteMessage extends ByteBuf { throw new IllegalArgumentException("Cannot read VarInt"); } - public void writeVarInt(int value){ + public void writeVarInt(int value) { while (true) { if ((value & 0xFFFFFF80) == 0) { buf.writeByte(value); @@ -78,7 +78,7 @@ public class ByteMessage extends ByteBuf { buf.writeCharSequence(str, StandardCharsets.UTF_8); } - public byte[] readBytesArray(){ + public byte[] readBytesArray() { int length = readVarInt(); byte[] array = new byte[length]; buf.readBytes(array); @@ -146,7 +146,7 @@ public class ByteMessage extends ByteBuf { writeVarInt(compoundTags.length); - for (CompoundBinaryTag tag : compoundTags){ + for (CompoundBinaryTag tag : compoundTags) { BinaryTagIO.writeDataOutput(tag, stream); } } catch (IOException e) { @@ -1139,7 +1139,7 @@ public class ByteMessage extends ByteBuf { return buf.release(decrement); } - public static ByteMessage create(){ + public static ByteMessage create() { return new ByteMessage(Unpooled.buffer()); } } diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginPluginResponse.java b/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginPluginResponse.java index a022e42..19febec 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginPluginResponse.java +++ b/src/main/java/ru/nanit/limbo/protocol/packets/login/PacketLoginPluginResponse.java @@ -26,7 +26,7 @@ public class PacketLoginPluginResponse implements PacketIn { messageId = msg.readVarInt(); successful = msg.readBoolean(); - if (msg.readableBytes() > 0){ + if (msg.readableBytes() > 0) { int i = msg.readableBytes(); data = new ByteMessage(msg.readBytes(i)); } diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketChatMessage.java b/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketChatMessage.java index 5ccacb5..6191f3b 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketChatMessage.java +++ b/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketChatMessage.java @@ -38,7 +38,7 @@ public class PacketChatMessage implements PacketOut { private final int index; - Position(int index){ + Position(int index) { this.index = index; } diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketDeclareCommands.java b/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketDeclareCommands.java index 24926cb..cf7130b 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketDeclareCommands.java +++ b/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketDeclareCommands.java @@ -22,14 +22,14 @@ public class PacketDeclareCommands implements PacketOut { msg.writeByte(0); msg.writeVarInt(commands.size()); - for (int i = 1; i <= commands.size() * 2; i++){ + for (int i = 1; i <= commands.size() * 2; i++) { msg.writeVarInt(i++); } // Declare other commands int i = 1; - for (String cmd : commands){ + for (String cmd : commands) { msg.writeByte(1 | 0x04); msg.writeVarInt(1); msg.writeVarInt(i + 1); diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java b/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java index caf06c3..44846f7 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java +++ b/src/main/java/ru/nanit/limbo/protocol/packets/play/PacketPlayerInfo.java @@ -18,11 +18,11 @@ public class PacketPlayerInfo implements PacketOut { this.gameMode = gameMode; } - public void setUsername(String username){ + public void setUsername(String username) { this.username = username; } - public void setUuid(UUID uuid){ + public void setUuid(UUID uuid) { this.uuid = uuid; } diff --git a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java b/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java index 131f406..1dcbb94 100644 --- a/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java +++ b/src/main/java/ru/nanit/limbo/protocol/packets/status/PacketStatusResponse.java @@ -10,9 +10,9 @@ public class PacketStatusResponse implements PacketOut { private LimboServer server; - public PacketStatusResponse(){ } + public PacketStatusResponse() { } - public PacketStatusResponse(LimboServer server){ + public PacketStatusResponse(LimboServer server) { this.server = server; } @@ -26,7 +26,7 @@ public class PacketStatusResponse implements PacketOut { msg.writeString(json); } - private String getResponseJson(String version, int protocol, int maxPlayers, int online, String description){ + private String getResponseJson(String version, int protocol, int maxPlayers, int online, String description) { return String.format(TEMPLATE, version, protocol, maxPlayers, online, description); } } diff --git a/src/main/java/ru/nanit/limbo/protocol/registry/State.java b/src/main/java/ru/nanit/limbo/protocol/registry/State.java index fcc6e39..7b3c339 100644 --- a/src/main/java/ru/nanit/limbo/protocol/registry/State.java +++ b/src/main/java/ru/nanit/limbo/protocol/registry/State.java @@ -14,12 +14,12 @@ import java.util.function.Supplier; public enum State { - HANDSHAKING(0){ + HANDSHAKING(0) { { serverBound.register(0x00, PacketHandshake::new); } }, - STATUS(1){ + STATUS(1) { { serverBound.register(0x01, PacketStatusPing::new); serverBound.register(0x00, PacketStatusRequest::new); @@ -27,7 +27,7 @@ public enum State { clientBound.register(0x01, PacketStatusPing::new); } }, - LOGIN(2){ + LOGIN(2) { { serverBound.register(0x00, PacketLoginStart::new); serverBound.register(0x02, PacketLoginPluginResponse::new); @@ -36,7 +36,7 @@ public enum State { clientBound.register(0x04, PacketLoginPluginRequest::new); } }, - PLAY(3){ + PLAY(3) { { serverBound.register(0x10, PacketKeepAlive::new); clientBound.register(0x10, PacketDeclareCommands::new); @@ -53,7 +53,7 @@ public enum State { private static final Map STATE_BY_ID = new HashMap<>(); static { - for (State registry : values()){ + for (State registry : values()) { STATE_BY_ID.put(registry.stateId, registry); } } @@ -62,11 +62,11 @@ public enum State { public final PacketRegistry serverBound = new PacketRegistry(); public final PacketRegistry clientBound = new PacketRegistry(); - State(int stateId){ + State(int stateId) { this.stateId = stateId; } - public static State getById(int stateId){ + public static State getById(int stateId) { return STATE_BY_ID.get(stateId); } @@ -75,16 +75,16 @@ public enum State { private final Map> packetsById = new HashMap<>(); private final Map, Integer> packetIdByClass = new HashMap<>(); - public Packet getPacket(int packetId){ + public Packet getPacket(int packetId) { Supplier supplier = packetsById.get(packetId); return supplier == null ? null : (Packet) supplier.get(); } - public int getPacketId(Class packetClass){ + public int getPacketId(Class packetClass) { return packetIdByClass.getOrDefault(packetClass, -1); } - public void register(int packetId, Supplier supplier){ + public void register(int packetId, Supplier supplier) { packetsById.put(packetId, supplier); packetIdByClass.put(supplier.get().getClass(), packetId); } diff --git a/src/main/java/ru/nanit/limbo/protocol/registry/Version.java b/src/main/java/ru/nanit/limbo/protocol/registry/Version.java index 70044e1..896c330 100644 --- a/src/main/java/ru/nanit/limbo/protocol/registry/Version.java +++ b/src/main/java/ru/nanit/limbo/protocol/registry/Version.java @@ -38,26 +38,26 @@ public enum Version { static { VERSION_MAP = new HashMap<>(); - for (Version version : values()){ + for (Version version : values()) { VERSION_MAP.put(version.getProtocolNumber(), version); } } - public static Version getCurrentSupported(){ + public static Version getCurrentSupported() { return V1_16_4; } - public static Version of(int protocolNumber){ + public static Version of(int protocolNumber) { return VERSION_MAP.getOrDefault(protocolNumber, UNDEFINED); } private final int protocolNumber; - Version(int protocolNumber){ + Version(int protocolNumber) { this.protocolNumber = protocolNumber; } - public int getProtocolNumber(){ + public int getProtocolNumber() { return this.protocolNumber; } diff --git a/src/main/java/ru/nanit/limbo/server/Connections.java b/src/main/java/ru/nanit/limbo/server/Connections.java index c2bee63..b4bf16b 100644 --- a/src/main/java/ru/nanit/limbo/server/Connections.java +++ b/src/main/java/ru/nanit/limbo/server/Connections.java @@ -13,24 +13,24 @@ public final class Connections { private final Map connections; - public Connections(){ + public Connections() { connections = new ConcurrentHashMap<>(); } - public Collection getAllConnections(){ + public Collection getAllConnections() { return Collections.unmodifiableCollection(connections.values()); } - public int getCount(){ + public int getCount() { return connections.size(); } - public void addConnection(ClientConnection connection){ + public void addConnection(ClientConnection connection) { connections.put(connection.getUuid(), connection); Logger.info("Player %s connected (%s)", connection.getUsername(), connection.getAddress()); } - public void removeConnection(ClientConnection connection){ + public void removeConnection(ClientConnection connection) { connections.remove(connection.getUuid()); Logger.info("Player %s disconnected", connection.getUsername()); } diff --git a/src/main/java/ru/nanit/limbo/server/LimboServer.java b/src/main/java/ru/nanit/limbo/server/LimboServer.java index 51c5ab6..80af77c 100644 --- a/src/main/java/ru/nanit/limbo/server/LimboServer.java +++ b/src/main/java/ru/nanit/limbo/server/LimboServer.java @@ -30,11 +30,11 @@ public final class LimboServer { private EventLoopGroup bossGroup; private EventLoopGroup workerGroup; - public LimboConfig getConfig(){ + public LimboConfig getConfig() { return config; } - public Connections getConnections(){ + public Connections getConnections() { return connections; } @@ -67,10 +67,10 @@ public final class LimboServer { Logger.info("Server started on %s", config.getAddress()); } - private void startBootstrap(){ + private void startBootstrap() { Class channelClass; - if (config.isUseEpoll() && Epoll.isAvailable()){ + if (config.isUseEpoll() && Epoll.isAvailable()) { bossGroup = new EpollEventLoopGroup(config.getBossGroupSize()); workerGroup = new EpollEventLoopGroup(config.getWorkerGroupSize()); channelClass = EpollServerSocketChannel.class; @@ -91,20 +91,20 @@ public final class LimboServer { .bind(); } - private void broadcastKeepAlive(){ + private void broadcastKeepAlive() { connections.getAllConnections().forEach(ClientConnection::sendKeepAlive); } - private void stop(){ - if (keepAliveTask != null){ + private void stop() { + if (keepAliveTask != null) { keepAliveTask.cancel(true); } - if (bossGroup != null){ + if (bossGroup != null) { bossGroup.shutdownGracefully(); } - if (workerGroup != null){ + if (workerGroup != null) { workerGroup.shutdownGracefully(); } } diff --git a/src/main/java/ru/nanit/limbo/server/data/BossBar.java b/src/main/java/ru/nanit/limbo/server/data/BossBar.java index 3781738..b42795b 100644 --- a/src/main/java/ru/nanit/limbo/server/data/BossBar.java +++ b/src/main/java/ru/nanit/limbo/server/data/BossBar.java @@ -101,13 +101,13 @@ public class BossBar { try { bossBar.setColor(Color.valueOf(node.node("color").getString("").toUpperCase())); - } catch (IllegalArgumentException e){ + } catch (IllegalArgumentException e) { throw new SerializationException("Invalid bossbar color"); } try { bossBar.setDivision(Division.valueOf(node.node("division").getString("").toUpperCase())); - } catch (IllegalArgumentException e){ + } catch (IllegalArgumentException e) { throw new SerializationException("Invalid bossbar division"); } diff --git a/src/main/java/ru/nanit/limbo/server/data/InfoForwarding.java b/src/main/java/ru/nanit/limbo/server/data/InfoForwarding.java index 08ee5fb..ae3ae89 100644 --- a/src/main/java/ru/nanit/limbo/server/data/InfoForwarding.java +++ b/src/main/java/ru/nanit/limbo/server/data/InfoForwarding.java @@ -20,15 +20,15 @@ public class InfoForwarding { return secretKey; } - public boolean isNone(){ + public boolean isNone() { return type == Type.NONE; } - public boolean isLegacy(){ + public boolean isLegacy() { return type == Type.LEGACY; } - public boolean isModern(){ + public boolean isModern() { return type == Type.MODERN; } @@ -46,11 +46,11 @@ public class InfoForwarding { try { forwarding.type = Type.valueOf(node.node("type").getString("").toUpperCase()); - } catch (IllegalArgumentException e){ + } catch (IllegalArgumentException e) { throw new SerializationException("Undefined info forwarding type"); } - if (forwarding.type == Type.MODERN){ + if (forwarding.type == Type.MODERN) { forwarding.secretKey = node.node("secret").getString("").getBytes(StandardCharsets.UTF_8); } diff --git a/src/main/java/ru/nanit/limbo/util/Colors.java b/src/main/java/ru/nanit/limbo/util/Colors.java index fc9e83a..84e4faa 100644 --- a/src/main/java/ru/nanit/limbo/util/Colors.java +++ b/src/main/java/ru/nanit/limbo/util/Colors.java @@ -5,9 +5,9 @@ public final class Colors { private static final char CHAR_FROM = '\u0026'; private static final char CHAR_TO = '\u00A7'; - private Colors(){} + private Colors() {} - public static String of(String text){ + public static String of(String text) { return text.replace(CHAR_FROM, CHAR_TO); } diff --git a/src/main/java/ru/nanit/limbo/util/Logger.java b/src/main/java/ru/nanit/limbo/util/Logger.java index 81a6efb..15312b9 100644 --- a/src/main/java/ru/nanit/limbo/util/Logger.java +++ b/src/main/java/ru/nanit/limbo/util/Logger.java @@ -8,48 +8,48 @@ public final class Logger { private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("hh:mm:ss"); private static int debugLevel = 3; - private Logger(){} + private Logger() {} - public static void setLevel(int level){ + public static void setLevel(int level) { debugLevel = level; } - public static void info(Object msg, Object... args){ + public static void info(Object msg, Object... args) { print(Level.INFO, msg, null, args); } - public static void debug(Object msg, Object... args){ + public static void debug(Object msg, Object... args) { print(Level.DEBUG, msg, null, args); } - public static void warning(Object msg, Object... args){ + public static void warning(Object msg, Object... args) { print(Level.WARNING, msg, null, args); } - public static void warning(Object msg, Throwable t, Object... args){ + public static void warning(Object msg, Throwable t, Object... args) { print(Level.WARNING, msg, t, args); } - public static void error(Object msg, Object... args){ + public static void error(Object msg, Object... args) { print(Level.ERROR, msg, null, args); } - public static void error(Object msg, Throwable t, Object... args){ + public static void error(Object msg, Throwable t, Object... args) { print(Level.ERROR, msg, t, args); } - public static void print(Level level, Object msg, Throwable t, Object... args){ - if (debugLevel >= level.getIndex()){ + public static void print(Level level, Object msg, Throwable t, Object... args) { + if (debugLevel >= level.getIndex()) { System.out.println(String.format("%s: %s", getPrefix(level), String.format(msg.toString(), args))); if (t != null) t.printStackTrace(); } } - private static String getPrefix(Level level){ + private static String getPrefix(Level level) { return String.format("[%s] [%s]", getTime(), level.getDisplay()); } - private static String getTime(){ + private static String getTime() { return LocalTime.now().format(FORMATTER); } @@ -63,7 +63,7 @@ public final class Logger { private final String display; private final int index; - Level(String display, int index){ + Level(String display, int index) { this.display = display; this.index = index; } diff --git a/src/main/java/ru/nanit/limbo/util/UuidUtil.java b/src/main/java/ru/nanit/limbo/util/UuidUtil.java index 87b5b41..a3868a8 100644 --- a/src/main/java/ru/nanit/limbo/util/UuidUtil.java +++ b/src/main/java/ru/nanit/limbo/util/UuidUtil.java @@ -5,14 +5,14 @@ import java.util.UUID; public final class UuidUtil { - private UuidUtil(){} + private UuidUtil() {} - public static UUID getOfflineModeUuid(String username){ + public static UUID getOfflineModeUuid(String username) { return UUID.nameUUIDFromBytes(("OfflinePlayer:" + username) .getBytes(StandardCharsets.UTF_8)); } - public static UUID fromString(String str){ + public static UUID fromString(String str) { if(str.contains("-")) return UUID.fromString(str); return UUID.fromString(str.replaceFirst("(\\p{XDigit}{8})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}+)", "$1-$2-$3-$4-$5")); } diff --git a/src/main/java/ru/nanit/limbo/world/DimensionRegistry.java b/src/main/java/ru/nanit/limbo/world/DimensionRegistry.java index d021207..90364f1 100644 --- a/src/main/java/ru/nanit/limbo/world/DimensionRegistry.java +++ b/src/main/java/ru/nanit/limbo/world/DimensionRegistry.java @@ -18,7 +18,7 @@ public final class DimensionRegistry { private CompoundBinaryTag theEnd; private CompoundBinaryTag nether; - public CompoundBinaryTag getCodec(){ + public CompoundBinaryTag getCodec() { return codec; } @@ -47,7 +47,7 @@ public final class DimensionRegistry { nether = (CompoundBinaryTag) ((CompoundBinaryTag) dimensions.get(2)).get("element"); theEnd = (CompoundBinaryTag) ((CompoundBinaryTag) dimensions.get(3)).get("element"); - switch (def.toLowerCase()){ + switch (def.toLowerCase()) { case "overworld": defaultDimension = overWorld; break;