AdlC/PicoLimbo
1
0
Fork 0
mirror of https://github.com/Nan1t/NanoLimbo.git synced 2026-02-11 03:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added packet pre-encoding. Code style.

Browse Source
This commit is contained in:
Nan1t
2020-11-28 18:49:18 +02:00
parent 95289e169c
commit cc251c17e2
8 changed files with 207 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/ru/nanit/limbo/server/Connections.java
View File

@@ -1,6 +1,7 @@
package ru.nanit.limbo.server;
import ru.nanit.limbo.connection.ClientConnection;
import ru.nanit.limbo.util.Logger;
import java.util.Collection;
import java.util.Collections;
@@ -26,9 +27,11 @@ public final class Connections {
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){
connections.remove(connection.getUuid());
Logger.info("Player %s disconnected", connection.getUsername());
}
}

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

@@ -8,16 +8,12 @@ import ru.nanit.limbo.configuration.LimboConfig;
import ru.nanit.limbo.configuration.SocketAddressSerializer;
import ru.nanit.limbo.connection.ClientChannelInitializer;
import ru.nanit.limbo.connection.ClientConnection;
import ru.nanit.limbo.protocol.packets.play.PacketBossBar;
import ru.nanit.limbo.protocol.packets.play.PacketChatMessage;
import ru.nanit.limbo.server.data.*;
import ru.nanit.limbo.util.Logger;
import ru.nanit.limbo.util.VelocityUtil;
import ru.nanit.limbo.world.DimensionRegistry;
import java.net.SocketAddress;
import java.nio.file.Paths;
import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -28,9 +24,6 @@ public final class LimboServer {
private Connections connections;
private DimensionRegistry dimensionRegistry;
private PacketChatMessage joinMessage;
private PacketBossBar joinBossBar;
public LimboConfig getConfig(){
return config;
}
@@ -43,14 +36,6 @@ public final class LimboServer {
return dimensionRegistry;
}
public PacketChatMessage getJoinMessage() {
return joinMessage;
}
public PacketBossBar getJoinBossBar() {
return joinBossBar;
}
public void start() throws Exception {
Logger.info("Starting server...");
@@ -65,16 +50,11 @@ public final class LimboServer {
Logger.setLevel(config.getDebugLevel());
if (config.getInfoForwarding().isModern()){
VelocityUtil.init(config);
}
dimensionRegistry = new DimensionRegistry();
dimensionRegistry.load(config.getDimensionType());
connections = new Connections();
initInGameData();
ClientConnection.preInitPackets(this);
ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
executor.scheduleAtFixedRate(this::broadcastKeepAlive, 0L, 5L, TimeUnit.SECONDS);
@@ -89,21 +69,6 @@ public final class LimboServer {
Logger.info("Server started on %s", config.getAddress());
}
private void initInGameData(){
if (config.isUseJoinMessage()){
joinMessage = new PacketChatMessage();
joinMessage.setJsonData(config.getJoinMessage());
joinMessage.setPosition(PacketChatMessage.Position.CHAT);
joinMessage.setSender(UUID.randomUUID());
}
if (config.isUseBossBar()){
joinBossBar = new PacketBossBar();
joinBossBar.setBossBar(config.getBossBar());
joinBossBar.setUuid(UUID.randomUUID());
}
}
private void broadcastKeepAlive(){
connections.getAllConnections().forEach(ClientConnection::sendKeepAlive);
}