Skip to content

Commit b0cad56

Browse files
Fallen-BreathFallen-Breath
committed
fix checkstyle
1 parent a5a4ad1 commit b0cad56

10 files changed

Lines changed: 42 additions & 42 deletions

‎proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftSessionHandler.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@
8585
import com.velocitypowered.proxy.protocol.packet.title.TitleSubtitlePacket;
8686
import com.velocitypowered.proxy.protocol.packet.title.TitleTextPacket;
8787
import com.velocitypowered.proxy.protocol.packet.title.TitleTimesPacket;
88-
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrSpawnEntityS2CPacket;
89-
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrSpawnPlayerS2CPacket;
90-
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrSpectatorTeleportC2SPacket;
88+
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrClientboundSpawnEntityPacket;
89+
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrClientboundSpawnPlayerPacket;
90+
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrServerboundSpectatorTeleportPacket;
9191
import io.netty.buffer.ByteBuf;
9292

9393
/**
@@ -320,15 +320,15 @@ default boolean handle(ActiveFeaturesPacket packet) {
320320
}
321321

322322
// [fallen's fork] player uuid rewrite - entity packet
323-
default boolean handle(UrSpawnPlayerS2CPacket packet) {
323+
default boolean handle(UrClientboundSpawnPlayerPacket packet) {
324324
return false;
325325
}
326326

327-
default boolean handle(UrSpawnEntityS2CPacket packet) {
327+
default boolean handle(UrClientboundSpawnEntityPacket packet) {
328328
return false;
329329
}
330330

331-
default boolean handle(UrSpectatorTeleportC2SPacket packet) {
331+
default boolean handle(UrServerboundSpectatorTeleportPacket packet) {
332332
return false;
333333
}
334334
// [fallen's fork] ends

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfoPacket;
6969
import com.velocitypowered.proxy.protocol.packet.chat.ComponentHolder;
7070
import com.velocitypowered.proxy.protocol.packet.config.StartUpdatePacket;
71-
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrSpawnEntityS2CPacket;
72-
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrSpawnPlayerS2CPacket;
71+
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrClientboundSpawnEntityPacket;
72+
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrClientboundSpawnPlayerPacket;
7373
import com.velocitypowered.proxy.protocol.util.PluginMessageUtil;
7474
import com.velocitypowered.proxy.uuidrewrite.EntityPacketUuidRewriter;
7575
import com.velocitypowered.proxy.uuidrewrite.TabListUuidRewriter;
@@ -369,13 +369,13 @@ public boolean handle(RemovePlayerInfoPacket packet) {
369369

370370
// [fallen's fork] player uuid rewrite - entity packet
371371
@Override
372-
public boolean handle(UrSpawnPlayerS2CPacket packet) {
372+
public boolean handle(UrClientboundSpawnPlayerPacket packet) {
373373
EntityPacketUuidRewriter.rewriteS2C(server, serverConn.getPlayer(), packet);
374374
return false;
375375
}
376376

377377
@Override
378-
public boolean handle(UrSpawnEntityS2CPacket packet) {
378+
public boolean handle(UrClientboundSpawnEntityPacket packet) {
379379
EntityPacketUuidRewriter.rewriteS2C(server, serverConn.getPlayer(), packet);
380380
return false;
381381
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
import com.velocitypowered.proxy.protocol.packet.chat.session.SessionPlayerCommandPacket;
7171
import com.velocitypowered.proxy.protocol.packet.config.FinishedUpdatePacket;
7272
import com.velocitypowered.proxy.protocol.packet.title.GenericTitlePacket;
73-
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrSpectatorTeleportC2SPacket;
73+
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrServerboundSpectatorTeleportPacket;
7474
import com.velocitypowered.proxy.protocol.util.PluginMessageUtil;
7575
import com.velocitypowered.proxy.util.CharacterUtil;
7676
import com.velocitypowered.proxy.util.except.QuietRuntimeException;
@@ -400,7 +400,7 @@ public boolean handle(ResourcePackResponsePacket packet) {
400400

401401
// [fallen's fork] player uuid rewrite - entity packet
402402
@Override
403-
public boolean handle(UrSpectatorTeleportC2SPacket packet) {
403+
public boolean handle(UrServerboundSpectatorTeleportPacket packet) {
404404
EntityPacketUuidRewriter.rewriteC2S(server, player, packet);
405405
return false;
406406
}

‎proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@
120120
import com.velocitypowered.proxy.protocol.packet.title.TitleSubtitlePacket;
121121
import com.velocitypowered.proxy.protocol.packet.title.TitleTextPacket;
122122
import com.velocitypowered.proxy.protocol.packet.title.TitleTimesPacket;
123-
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrSpawnEntityS2CPacket;
124-
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrSpawnPlayerS2CPacket;
125-
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrSpectatorTeleportC2SPacket;
123+
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrClientboundSpawnEntityPacket;
124+
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrClientboundSpawnPlayerPacket;
125+
import com.velocitypowered.proxy.protocol.packet.uuidrewrite.UrServerboundSpectatorTeleportPacket;
126126
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
127127
import io.netty.util.collection.IntObjectHashMap;
128128
import io.netty.util.collection.IntObjectMap;
@@ -810,17 +810,17 @@ public enum StateRegistry {
810810
// [fallen's fork] player uuid rewrite - entity packet
811811
// see also: https://github.com/derklaro/mc-protocol
812812
// e.g., https://github.com/derklaro/mc-protocol/blob/1.21.8/readme.md
813-
clientbound.register(UrSpawnPlayerS2CPacket.class, UrSpawnPlayerS2CPacket::new,
813+
clientbound.register(UrClientboundSpawnPlayerPacket.class, UrClientboundSpawnPlayerPacket::new,
814814
map(0x0C, MINECRAFT_1_8, false),
815815
map(0x05, MINECRAFT_1_9, false),
816816
map(0x04, MINECRAFT_1_16, false),
817817
map(0x02, MINECRAFT_1_19, false),
818818
map(0x03, MINECRAFT_1_19_4, false),
819819
map(-1, MINECRAFT_1_20_2, false));
820-
clientbound.register(UrSpawnEntityS2CPacket.class, UrSpawnEntityS2CPacket::new,
820+
clientbound.register(UrClientboundSpawnEntityPacket.class, UrClientboundSpawnEntityPacket::new,
821821
// the "Add Entity" S2C packet
822822
map(0x01, MINECRAFT_1_20_2, false));
823-
serverbound.register(UrSpectatorTeleportC2SPacket.class, UrSpectatorTeleportC2SPacket::new,
823+
serverbound.register(UrServerboundSpectatorTeleportPacket.class, UrServerboundSpectatorTeleportPacket::new,
824824
// the "Teleport To Entity" C2S packet
825825
map(0x18, MINECRAFT_1_8, false),
826826
map(0x1B, MINECRAFT_1_9, false),

‎proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/uuidrewrite/PacketToRewriteEntityUuid.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919

2020
import java.util.UUID;
2121

22+
/**
23+
* [fallen's fork] player uuid rewrite - packet interface.
24+
*/
2225
public interface PacketToRewriteEntityUuid {
2326

2427
boolean isPlayer();

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/uuidrewrite/UrSpawnEntityS2CPacket.java renamed to proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/uuidrewrite/UrClientboundSpawnEntityPacket.java

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222
import com.velocitypowered.proxy.protocol.MinecraftPacket;
2323
import com.velocitypowered.proxy.protocol.ProtocolUtils;
2424
import io.netty.buffer.ByteBuf;
25-
2625
import java.util.UUID;
2726

2827
/**
29-
* [fallen's fork] player uuid rewrite - entity packet
30-
* Used in mc >= 1.20.2
31-
* For mc < 1.20.2, {@link UrSpawnPlayerS2CPacket} does the thing
28+
* [fallen's fork] player uuid rewrite - S2C entity packet.
29+
* Used in mc >= 1.20.2.
30+
* For mc < 1.20.2, {@link UrClientboundSpawnPlayerPacket} does the thing
3231
*/
33-
public class UrSpawnEntityS2CPacket implements MinecraftPacket, PacketToRewriteEntityUuid {
32+
public class UrClientboundSpawnEntityPacket implements MinecraftPacket, PacketToRewriteEntityUuid {
3433

3534
private int entityId;
3635
private UUID entityUuid;
@@ -45,15 +44,15 @@ private record EntityTypeId(ProtocolVersion protocolVersion, int id) {}
4544
// https://github.com/Fallen-Breath/mc-registry-dump/tree/master/output, data["entity_type"]["minecraft:player"]
4645
// https://github.com/PrismarineJS/minecraft-data/blob/master/data/pc/1.21.4/entities.json
4746
private static final EntityTypeId[] PLAYER_ENTITY_TYPE_ID_MAPPINGS = new EntityTypeId[]{
48-
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_11, 155),
49-
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_9, 151),
50-
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_6, 149),
51-
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_5, 148),
52-
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_4, 147),
53-
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_2, 148),
54-
new EntityTypeId(ProtocolVersion.MINECRAFT_1_20_5, 128),
55-
new EntityTypeId(ProtocolVersion.MINECRAFT_1_20_3, 124),
56-
new EntityTypeId(ProtocolVersion.MINECRAFT_1_20_2, 122)
47+
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_11, 155),
48+
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_9, 151),
49+
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_6, 149),
50+
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_5, 148),
51+
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_4, 147),
52+
new EntityTypeId(ProtocolVersion.MINECRAFT_1_21_2, 148),
53+
new EntityTypeId(ProtocolVersion.MINECRAFT_1_20_5, 128),
54+
new EntityTypeId(ProtocolVersion.MINECRAFT_1_20_3, 124),
55+
new EntityTypeId(ProtocolVersion.MINECRAFT_1_20_2, 122)
5756
};
5857

5958
private static int getPlayerEntityTypeId(ProtocolVersion version) {

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/uuidrewrite/UrSpawnPlayerS2CPacket.java renamed to proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/uuidrewrite/UrClientboundSpawnPlayerPacket.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@
2222
import com.velocitypowered.proxy.protocol.MinecraftPacket;
2323
import com.velocitypowered.proxy.protocol.ProtocolUtils;
2424
import io.netty.buffer.ByteBuf;
25-
2625
import java.util.UUID;
2726

2827
/**
29-
* [fallen's fork] player uuid rewrite - entity packet
28+
* [fallen's fork] player uuid rewrite - S2C entity packet.
3029
* used in mc < 1.20.2
3130
*/
32-
public class UrSpawnPlayerS2CPacket implements MinecraftPacket, PacketToRewriteEntityUuid {
31+
public class UrClientboundSpawnPlayerPacket implements MinecraftPacket, PacketToRewriteEntityUuid {
3332

3433
private int entityId;
3534
private UUID entityUuid;

proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/uuidrewrite/UrSpectatorTeleportC2SPacket.java renamed to proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/uuidrewrite/UrServerboundSpectatorTeleportPacket.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@
2222
import com.velocitypowered.proxy.protocol.MinecraftPacket;
2323
import com.velocitypowered.proxy.protocol.ProtocolUtils;
2424
import io.netty.buffer.ByteBuf;
25-
2625
import java.util.UUID;
2726

2827
/**
29-
* [fallen's fork] player uuid rewrite - entity packet
28+
* [fallen's fork] player uuid rewrite - C2S entity packet.
3029
*/
31-
public class UrSpectatorTeleportC2SPacket implements MinecraftPacket, PacketToRewriteEntityUuid {
30+
public class UrServerboundSpectatorTeleportPacket implements MinecraftPacket, PacketToRewriteEntityUuid {
3231

3332
private UUID targetUuid;
3433

‎proxy/src/main/java/com/velocitypowered/proxy/uuidrewrite/TabListUuidRewriter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private static boolean shouldRewrite(VelocityServer server) {
4646
}
4747

4848
/**
49-
* [fallen's fork] player uuid rewrite
49+
* [fallen's fork] player uuid rewrite.
5050
* send the missing player tab-list removal packets to other players in the mc server
5151
* see bungeecord net.md_5.bungee.connection.UpstreamBridge#disconnected
5252
*/

‎proxy/src/main/java/com/velocitypowered/proxy/uuidrewrite/UuidMappingDatabase.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,9 @@ public void createNewEntry(UUID onlineUuid, UUID offlineUuid, String playerName,
183183
if (
184184
resultSet.next()
185185
&& Objects.equals(resultSet.getString("player_name"), playerName)
186-
&& Objects.equals(resultSet.getString("offline_uuid"), offlineUuid.toString())
187-
&& Objects.equals(resultSet.getString("online_uuid"), onlineUuid.toString())
188-
&& Arrays.equals(resultSet.getBytes("online_profile"), onlineProfileBuf)
186+
&& Objects.equals(resultSet.getString("offline_uuid"), offlineUuid.toString())
187+
&& Objects.equals(resultSet.getString("online_uuid"), onlineUuid.toString())
188+
&& Arrays.equals(resultSet.getBytes("online_profile"), onlineProfileBuf)
189189
) {
190190
// no changes to this player
191191
if (now / 1000 - resultSet.getBigDecimal("updated_at").longValue() < 60 * 60) { // 1h cooldown

0 commit comments

Comments
 (0)