Skip to content

Commit

Permalink
Fix project formatting style (#663)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Extollite
Extollite authored Oct 11, 2021
1 parent e7979c4 commit 72ba6f5
Show file tree
Hide file tree
Showing 102 changed files with 673 additions and 500 deletions.
40 changes: 20 additions & 20 deletions src/main/java/com/github/steveice10/mc/protocol/ClientListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class ClientListener extends SessionAdapter {
public void packetReceived(PacketReceivedEvent event) {
MinecraftProtocol protocol = (MinecraftProtocol) event.getSession().getPacketProtocol();
if (protocol.getSubProtocol() == SubProtocol.LOGIN) {
if(event.getPacket() instanceof EncryptionRequestPacket) {
if (event.getPacket() instanceof EncryptionRequestPacket) {
GameProfile profile = event.getSession().getFlag(MinecraftConstants.PROFILE_KEY);
String accessToken = event.getSession().getFlag(MinecraftConstants.ACCESS_TOKEN_KEY);

Expand All @@ -61,69 +61,69 @@ public void packetReceived(PacketReceivedEvent event) {
KeyGenerator gen = KeyGenerator.getInstance("AES");
gen.init(128);
key = gen.generateKey();
} catch(NoSuchAlgorithmException e) {
} catch (NoSuchAlgorithmException e) {
throw new IllegalStateException("Failed to generate shared key.", e);
}

SessionService sessionService = event.getSession().getFlag(MinecraftConstants.SESSION_SERVICE_KEY, new SessionService());
String serverId = sessionService.getServerId(packet.getServerId(), packet.getPublicKey(), key);
try {
sessionService.joinServer(profile, accessToken, serverId);
} catch(ServiceUnavailableException e) {
} catch (ServiceUnavailableException e) {
event.getSession().disconnect("Login failed: Authentication service unavailable.", e);
return;
} catch(InvalidCredentialsException e) {
} catch (InvalidCredentialsException e) {
event.getSession().disconnect("Login failed: Invalid login session.", e);
return;
} catch(RequestException e) {
} catch (RequestException e) {
event.getSession().disconnect("Login failed: Authentication error: " + e.getMessage(), e);
return;
}

event.getSession().send(new EncryptionResponsePacket(packet.getPublicKey(), key, packet.getVerifyToken()));
protocol.enableEncryption(key);
} else if(event.getPacket() instanceof LoginSuccessPacket) {
} else if (event.getPacket() instanceof LoginSuccessPacket) {
protocol.setSubProtocol(SubProtocol.GAME, true, event.getSession());
} else if(event.getPacket() instanceof LoginDisconnectPacket) {
} else if (event.getPacket() instanceof LoginDisconnectPacket) {
event.getSession().disconnect(event.<LoginDisconnectPacket>getPacket().getReason().toString());
} else if(event.getPacket() instanceof LoginSetCompressionPacket) {
} else if (event.getPacket() instanceof LoginSetCompressionPacket) {
event.getSession().setCompressionThreshold(event.<LoginSetCompressionPacket>getPacket().getThreshold());
}
} else if(protocol.getSubProtocol() == SubProtocol.STATUS) {
if(event.getPacket() instanceof StatusResponsePacket) {
} else if (protocol.getSubProtocol() == SubProtocol.STATUS) {
if (event.getPacket() instanceof StatusResponsePacket) {
ServerStatusInfo info = event.<StatusResponsePacket>getPacket().getInfo();
ServerInfoHandler handler = event.getSession().getFlag(MinecraftConstants.SERVER_INFO_HANDLER_KEY);
if(handler != null) {
if (handler != null) {
handler.handle(event.getSession(), info);
}

event.getSession().send(new StatusPingPacket(System.currentTimeMillis()));
} else if(event.getPacket() instanceof StatusPongPacket) {
} else if (event.getPacket() instanceof StatusPongPacket) {
long time = System.currentTimeMillis() - event.<StatusPongPacket>getPacket().getPingTime();
ServerPingTimeHandler handler = event.getSession().getFlag(MinecraftConstants.SERVER_PING_TIME_HANDLER_KEY);
if(handler != null) {
if (handler != null) {
handler.handle(event.getSession(), time);
}

event.getSession().disconnect("Finished");
}
} else if(protocol.getSubProtocol() == SubProtocol.GAME) {
if(event.getPacket() instanceof ServerKeepAlivePacket && event.getSession().getFlag(MinecraftConstants.AUTOMATIC_KEEP_ALIVE_MANAGEMENT, true)) {
} else if (protocol.getSubProtocol() == SubProtocol.GAME) {
if (event.getPacket() instanceof ServerKeepAlivePacket && event.getSession().getFlag(MinecraftConstants.AUTOMATIC_KEEP_ALIVE_MANAGEMENT, true)) {
event.getSession().send(new ClientKeepAlivePacket(event.<ServerKeepAlivePacket>getPacket().getPingId()));
} else if(event.getPacket() instanceof ServerDisconnectPacket) {
} else if (event.getPacket() instanceof ServerDisconnectPacket) {
event.getSession().disconnect(event.<ServerDisconnectPacket>getPacket().getReason().toString());
}
}
}

@Override
public void packetSent(PacketSentEvent event) {
if(event.getPacket() instanceof HandshakePacket) {
if (event.getPacket() instanceof HandshakePacket) {
// Once the HandshakePacket has been sent, switch to the next protocol mode.
MinecraftProtocol protocol = (MinecraftProtocol) event.getSession().getPacketProtocol();
protocol.setSubProtocol(this.targetSubProtocol, true, event.getSession());

if(this.targetSubProtocol == SubProtocol.LOGIN) {
if (this.targetSubProtocol == SubProtocol.LOGIN) {
GameProfile profile = event.getSession().getFlag(MinecraftConstants.PROFILE_KEY);
event.getSession().send(new LoginStartPacket(profile.getName()));
} else {
Expand All @@ -134,9 +134,9 @@ public void packetSent(PacketSentEvent event) {

@Override
public void connected(ConnectedEvent event) {
if(this.targetSubProtocol == SubProtocol.LOGIN) {
if (this.targetSubProtocol == SubProtocol.LOGIN) {
event.getSession().send(new HandshakePacket(MinecraftConstants.PROTOCOL_VERSION, event.getSession().getHost(), event.getSession().getPort(), HandshakeIntent.LOGIN));
} else if(this.targetSubProtocol == SubProtocol.STATUS) {
} else if (this.targetSubProtocol == SubProtocol.STATUS) {
event.getSession().send(new HandshakePacket(MinecraftConstants.PROTOCOL_VERSION, event.getSession().getHost(), event.getSession().getPort(), HandshakeIntent.STATUS));
}
}
Expand Down
Loading

0 comments on commit 72ba6f5

Please sign in to comment.