Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleClient

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:13:48 +02:00
parent da8837710a
commit b07e6799dc
425 changed files with 1110 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/netty/ChannelServerInitializer.java
View File

@@ -1,6 +1,6 @@
package net.netty;
import client.MapleClient;
import client.Client;
import io.netty.channel.socket.SocketChannel;
import net.PacketProcessor;
import net.server.Server;
@@ -27,7 +27,7 @@ public class ChannelServerInitializer extends ServerChannelInitializer {
PacketProcessor packetProcessor = PacketProcessor.getChannelServerProcessor(world, channel);
final long clientSessionId = sessionId.getAndIncrement();
final String remoteAddress = getRemoteAddress(socketChannel);
final MapleClient client = MapleClient.createChannelClient(clientSessionId, remoteAddress, packetProcessor, world, channel);
final Client client = Client.createChannelClient(clientSessionId, remoteAddress, packetProcessor, world, channel);
if (Server.getInstance().getChannel(world, channel) == null) {
SessionCoordinator.getInstance().closeSession(client, true);

4
src/main/java/net/netty/LoginServerInitializer.java
View File

@@ -1,6 +1,6 @@
package net.netty;
import client.MapleClient;
import client.Client;
import io.netty.channel.socket.SocketChannel;
import net.PacketProcessor;
import net.server.coordinator.session.SessionCoordinator;
@@ -18,7 +18,7 @@ public class LoginServerInitializer extends ServerChannelInitializer {
PacketProcessor packetProcessor = PacketProcessor.getLoginServerProcessor();
final long clientSessionId = sessionId.getAndIncrement();
final String remoteAddress = getRemoteAddress(socketChannel);
final MapleClient client = MapleClient.createLoginClient(clientSessionId, remoteAddress, packetProcessor, LoginServer.WORLD_ID, LoginServer.CHANNEL_ID);
final Client client = Client.createLoginClient(clientSessionId, remoteAddress, packetProcessor, LoginServer.WORLD_ID, LoginServer.CHANNEL_ID);
if (!SessionCoordinator.getInstance().canStartLoginSession(client)) {
socketChannel.close();

12
src/main/java/net/netty/ServerChannelInitializer.java
View File

@@ -1,6 +1,6 @@
package net.netty;
import client.MapleClient;
import client.Client;
import config.YamlConfig;
import constants.net.ServerConstants;
import io.netty.buffer.Unpooled;
@@ -46,7 +46,7 @@ public abstract class ServerChannelInitializer extends ChannelInitializer<Socket
return remoteAddress;
}
void initPipeline(SocketChannel socketChannel, MapleClient client) {
void initPipeline(SocketChannel socketChannel, Client client) {
final InitializationVector sendIv = InitializationVector.generateSend();
final InitializationVector recvIv = InitializationVector.generateReceive();
writeInitialUnencryptedHelloPacket(socketChannel, sendIv, recvIv);
@@ -58,14 +58,14 @@ public abstract class ServerChannelInitializer extends ChannelInitializer<Socket
}
private void setUpHandlers(ChannelPipeline pipeline, InitializationVector sendIv, InitializationVector recvIv,
MapleClient client) {
Client client) {
pipeline.addLast("IdleStateHandler", new IdleStateHandler(0, 0, IDLE_TIME_SECONDS));
pipeline.addLast("PacketCodec", new PacketCodec(ClientCyphers.of(sendIv, recvIv)));
pipeline.addLast("MapleClient", client);
pipeline.addLast("Client", client);
if (LOG_PACKETS) {
pipeline.addBefore("MapleClient", "SendPacketLogger", sendPacketLogger);
pipeline.addBefore("MapleClient", "ReceivePacketLogger", receivePacketLogger);
pipeline.addBefore("Client", "SendPacketLogger", sendPacketLogger);
pipeline.addBefore("Client", "ReceivePacketLogger", receivePacketLogger);
}
}
}