Skip to content

Commit f572af1

Browse files
asteiastei
committed
convert some more packets to records
1 parent ae87791 commit f572af1

20 files changed

+110
-298
lines changed

‎proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public boolean handle(StartUpdatePacket packet) {
158158

159159
@Override
160160
public boolean handle(KeepAlivePacket packet) {
161-
serverConn.getPendingPings().put(packet.getRandomId(), System.nanoTime());
161+
serverConn.getPendingPings().put(packet.randomId(), System.nanoTime());
162162
return false; // forwards on
163163
}
164164

@@ -178,10 +178,10 @@ public boolean handle(DisconnectPacket packet) {
178178
@Override
179179
public boolean handle(BossBarPacket packet) {
180180
if (serverConn.getPlayer().getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20_2)) {
181-
if (packet.getAction() == BossBarPacket.ADD) {
182-
playerSessionHandler.getServerBossBars().add(packet.getUuid());
183-
} else if (packet.getAction() == BossBarPacket.REMOVE) {
184-
playerSessionHandler.getServerBossBars().remove(packet.getUuid());
181+
if (packet.action() == BossBarPacket.ADD) {
182+
playerSessionHandler.getServerBossBars().add(packet.uuid());
183+
} else if (packet.action() == BossBarPacket.REMOVE) {
184+
playerSessionHandler.getServerBossBars().remove(packet.uuid());
185185
}
186186
}
187187
return false; // forward
@@ -190,13 +190,13 @@ public boolean handle(BossBarPacket packet) {
190190
@Override
191191
public boolean handle(final ResourcePackRequestPacket packet) {
192192
final ResourcePackInfo.Builder builder = new VelocityResourcePackInfo.BuilderImpl(
193-
Preconditions.checkNotNull(packet.getUrl()))
194-
.setId(packet.getId())
195-
.setPrompt(packet.getPrompt() == null ? null : packet.getPrompt().getComponent())
193+
Preconditions.checkNotNull(packet.url()))
194+
.setId(packet.id())
195+
.setPrompt(packet.prompt() == null ? null : packet.prompt().getComponent())
196196
.setShouldForce(packet.isRequired())
197197
.setOrigin(ResourcePackInfo.Origin.DOWNSTREAM_SERVER);
198198

199-
final String hash = packet.getHash();
199+
final String hash = packet.hash();
200200
if (hash != null && !hash.isEmpty()) {
201201
if (PLAUSIBLE_SHA1_HASH.matcher(hash).matches()) {
202202
builder.setHash(ByteBufUtil.decodeHexDump(hash));
@@ -222,14 +222,14 @@ public boolean handle(final ResourcePackRequestPacket packet) {
222222
// Do not apply a resource pack that has already been applied
223223
if (serverConn.getConnection() != null) {
224224
serverConn.getConnection().write(new ResourcePackResponsePacket(
225-
packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.ACCEPTED));
225+
packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.ACCEPTED));
226226
if (serverConn.getConnection().getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20_3)) {
227227
serverConn.getConnection().write(new ResourcePackResponsePacket(
228-
packet.getId(), packet.getHash(),
228+
packet.id(), packet.hash(),
229229
PlayerResourcePackStatusEvent.Status.DOWNLOADED));
230230
}
231231
serverConn.getConnection().write(new ResourcePackResponsePacket(
232-
packet.getId(), packet.getHash(),
232+
packet.id(), packet.hash(),
233233
PlayerResourcePackStatusEvent.Status.SUCCESSFUL));
234234
}
235235
if (modifiedPack) {
@@ -241,16 +241,16 @@ public boolean handle(final ResourcePackRequestPacket packet) {
241241
}
242242
} else if (serverConn.getConnection() != null) {
243243
serverConn.getConnection().write(new ResourcePackResponsePacket(
244-
packet.getId(),
245-
packet.getHash(),
244+
packet.id(),
245+
packet.hash(),
246246
PlayerResourcePackStatusEvent.Status.DECLINED
247247
));
248248
}
249249
}, playerConnection.eventLoop()).exceptionally((ex) -> {
250250
if (serverConn.getConnection() != null) {
251251
serverConn.getConnection().write(new ResourcePackResponsePacket(
252-
packet.getId(),
253-
packet.getHash(),
252+
packet.id(),
253+
packet.hash(),
254254
PlayerResourcePackStatusEvent.Status.DECLINED
255255
));
256256
}

‎proxy/src/main/java/com/velocitypowered/proxy/connection/backend/ConfigSessionHandler.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public boolean handle(ClientboundServerLinksPacket packet) {
141141

142142
@Override
143143
public boolean handle(KeepAlivePacket packet) {
144-
serverConn.getPendingPings().put(packet.getRandomId(), System.nanoTime());
144+
serverConn.getPendingPings().put(packet.randomId(), System.nanoTime());
145145
serverConn.getPlayer().getConnection().write(packet);
146146
return true;
147147
}
@@ -171,11 +171,11 @@ public boolean handle(final ResourcePackRequestPacket packet) {
171171
if (serverConn.getConnection() != null) {
172172
// We can technically skip these first 2 states, however, for conformity to normal state flow expectations...
173173
serverConn.getConnection().write(new ResourcePackResponsePacket(
174-
packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.ACCEPTED));
174+
packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.ACCEPTED));
175175
serverConn.getConnection().write(new ResourcePackResponsePacket(
176-
packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.DOWNLOADED));
176+
packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.DOWNLOADED));
177177
serverConn.getConnection().write(new ResourcePackResponsePacket(
178-
packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.SUCCESSFUL));
178+
packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.SUCCESSFUL));
179179
}
180180
if (modifiedPack) {
181181
logger.warn("A plugin has tried to modify a ResourcePack provided by the backend server "
@@ -187,12 +187,12 @@ public boolean handle(final ResourcePackRequestPacket packet) {
187187
}
188188
} else if (serverConn.getConnection() != null) {
189189
serverConn.getConnection().write(new ResourcePackResponsePacket(
190-
packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.DECLINED));
190+
packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.DECLINED));
191191
}
192192
}, playerConnection.eventLoop()).exceptionally((ex) -> {
193193
if (serverConn.getConnection() != null) {
194194
serverConn.getConnection().write(new ResourcePackResponsePacket(
195-
packet.getId(), packet.getHash(), PlayerResourcePackStatusEvent.Status.DECLINED));
195+
packet.id(), packet.hash(), PlayerResourcePackStatusEvent.Status.DECLINED));
196196
}
197197
logger.error("Exception while handling resource pack send for {}", playerConnection, ex);
198198
return null;

‎proxy/src/main/java/com/velocitypowered/proxy/connection/client/AuthSessionHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public boolean handle(LoginAcknowledgedPacket packet) {
195195
@Override
196196
public boolean handle(ServerboundCookieResponsePacket packet) {
197197
server.getEventManager()
198-
.fire(new CookieReceiveEvent(connectedPlayer, packet.getKey(), packet.getPayload()))
198+
.fire(new CookieReceiveEvent(connectedPlayer, packet.key(), packet.payload()))
199199
.thenAcceptAsync(event -> {
200200
if (event.getResult().isAllowed()) {
201201
// The received cookie must have been requested by a proxy plugin in login phase,

‎proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientConfigSessionHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public boolean handle(KnownPacksPacket packet) {
188188
@Override
189189
public boolean handle(ServerboundCookieResponsePacket packet) {
190190
server.getEventManager()
191-
.fire(new CookieReceiveEvent(player, packet.getKey(), packet.getPayload()))
191+
.fire(new CookieReceiveEvent(player, packet.key(), packet.payload()))
192192
.thenAcceptAsync(event -> {
193193
if (event.getResult().isAllowed()) {
194194
final VelocityServerConnection serverConnection = player.getConnectionInFlight();

‎proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ public void handleConnectionException(RegisteredServer server, DisconnectPacket
735735
return;
736736
}
737737

738-
Component disconnectReason = disconnect.getReason().getComponent();
738+
Component disconnectReason = disconnect.reason().getComponent();
739739
String plainTextReason = PASS_THRU_TRANSLATE.serialize(disconnectReason);
740740
if (connectedServer != null && connectedServer.getServerInfo().equals(server.getServerInfo())) {
741741
if (this.server.getConfiguration().isLogPlayerConnections()) {
@@ -1349,7 +1349,7 @@ public boolean forwardKeepAlive(final KeepAlivePacket packet) {
13491349
13501350
private boolean sendKeepAliveToBackend(final @Nullable VelocityServerConnection serverConnection, final @NotNull KeepAlivePacket packet) {
13511351
if (serverConnection != null) {
1352-
final Long sentTime = serverConnection.getPendingPings().remove(packet.getRandomId());
1352+
final Long sentTime = serverConnection.getPendingPings().remove(packet.randomId());
13531353
if (sentTime != null) {
13541354
final MinecraftConnection smc = serverConnection.getConnection();
13551355
if (smc != null) {

‎proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialInboundConnection.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ public InetSocketAddress getRemoteAddress() {
6161

6262
@Override
6363
public Optional<InetSocketAddress> getVirtualHost() {
64-
return Optional.of(InetSocketAddress.createUnresolved(cleanedAddress, handshake.getPort()));
64+
return Optional.of(InetSocketAddress.createUnresolved(cleanedAddress, handshake.port()));
6565
}
6666

6767
@Override
6868
public Optional<String> getRawVirtualHost() {
69-
return Optional.of(handshake.getServerAddress());
69+
return Optional.of(handshake.serverAddress());
7070
}
7171

7272
@Override
@@ -101,7 +101,7 @@ public ProtocolState getProtocolState() {
101101

102102
@Override
103103
public HandshakeIntent getHandshakeIntent() {
104-
return handshake.getIntent();
104+
return handshake.intent();
105105
}
106106

107107
/**

‎proxy/src/main/java/com/velocitypowered/proxy/connection/client/InitialLoginSessionHandler.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public boolean handle(ServerLoginPacket packet) {
120120
inbound.setPlayerKey(playerKey);
121121
this.login = packet;
122122

123-
final PreLoginEvent event = new PreLoginEvent(inbound, login.getUsername(), login.holderUuid());
123+
final PreLoginEvent event = new PreLoginEvent(inbound, login.username(), login.holderUuid());
124124
server.getEventManager().fire(event).thenRunAsync(() -> {
125125
if (mcConnection.isClosed()) {
126126
// The player was disconnected
@@ -146,13 +146,13 @@ public boolean handle(ServerLoginPacket packet) {
146146
&& (server.getConfiguration().isOnlineMode() || result.isOnlineModeAllowed())) {
147147
// Request encryption.
148148
EncryptionRequestPacket request = generateEncryptionRequest();
149-
this.verify = Arrays.copyOf(request.getVerifyToken(), 4);
149+
this.verify = Arrays.copyOf(request.verifyToken(), 4);
150150
mcConnection.write(request);
151151
this.currentState = LoginState.ENCRYPTION_REQUEST_SENT;
152152
} else {
153153
mcConnection.setActiveSessionHandler(StateRegistry.LOGIN,
154154
new AuthSessionHandler(server, inbound,
155-
GameProfile.forOfflinePlayer(login.getUsername()), false));
155+
GameProfile.forOfflinePlayer(login.username()), false));
156156
}
157157
});
158158
});
@@ -203,7 +203,7 @@ public boolean handle(EncryptionResponsePacket packet) {
203203

204204
String playerIp = ((InetSocketAddress) mcConnection.getRemoteAddress()).getHostString();
205205
String url = String.format(MOJANG_HASJOINED_URL,
206-
urlFormParameterEscaper().escape(login.getUsername()), serverId);
206+
urlFormParameterEscaper().escape(login.username()), serverId);
207207

208208
if (server.getConfiguration().shouldPreventClientProxyConnections()) {
209209
url += "&ip=" + urlFormParameterEscaper().escape(playerIp);
@@ -263,7 +263,7 @@ public boolean handle(EncryptionResponsePacket packet) {
263263
// Something else went wrong
264264
logger.error(
265265
"Got an unexpected error code {} whilst contacting Mojang to log in {} ({})",
266-
response.statusCode(), login.getUsername(), playerIp);
266+
response.statusCode(), login.username(), playerIp);
267267
inbound.disconnect(Component.translatable("multiplayer.disconnect.authservers_down"));
268268
}
269269
}, mcConnection.eventLoop())

‎proxy/src/main/java/com/velocitypowered/proxy/connection/client/LoginInboundConnection.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ void cleanup() {
133133
}
134134

135135
void handleLoginPluginResponse(final LoginPluginResponsePacket response) {
136-
final MessageConsumer consumer = this.outstandingResponses.remove(response.getId());
136+
final MessageConsumer consumer = this.outstandingResponses.remove(response.id());
137137
if (consumer != null) {
138138
try {
139-
consumer.onMessageResponse(response.isSuccess() ? ByteBufUtil.getBytes(response.content())
139+
consumer.onMessageResponse(response.success() ? ByteBufUtil.getBytes(response.content())
140140
: null);
141141
} finally {
142142
final Runnable onAllMessagesHandled = this.onAllMessagesHandled;

‎proxy/src/main/java/com/velocitypowered/proxy/connection/util/ConnectionRequestResults.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ public static Impl forDisconnect(Component component, RegisteredServer server) {
6363
}
6464

6565
public static Impl forDisconnect(DisconnectPacket disconnect, RegisteredServer server) {
66-
return forDisconnect(disconnect.getReason().getComponent(), server);
66+
return forDisconnect(disconnect.reason().getComponent(), server);
6767
}
6868

6969
public static Impl forUnsafeDisconnect(DisconnectPacket disconnect, RegisteredServer server) {
70-
return new Impl(Status.SERVER_DISCONNECTED, disconnect.getReason().getComponent(), server,
70+
return new Impl(Status.SERVER_DISCONNECTED, disconnect.reason().getComponent(), server,
7171
false);
7272
}
7373

‎proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/BossBarPacket.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@ public record BossBarPacket(UUID uuid, int action, @Nullable ComponentHolder nam
6565
public static final int UPDATE_STYLE = 4;
6666
public static final int UPDATE_PROPERTIES = 5;
6767

68-
public UUID getUuid() {
69-
return uuid;
70-
}
71-
72-
public int getAction() {
73-
return action;
74-
}
75-
7668
public static BossBarPacket createAddPacket(
7769
final UUID id,
7870
final BossBar bar,

0 commit comments

Comments
 (0)