Skip to content

Commit 1508cd2

Browse files
authored
[ci skip] Remove redundant types (#1259)
1 parent bc7f360 commit 1508cd2

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/Protocol1_19_3To1_19_1.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@
7070
public final class Protocol1_19_3To1_19_1 extends BackwardsProtocol<ClientboundPackets1_19_3, ClientboundPackets1_19_1, ServerboundPackets1_19_3, ServerboundPackets1_19_1> {
7171

7272
public static final BackwardsMappingData MAPPINGS = new BackwardsMappingData("1.19.3", "1.19", Protocol1_19_1To1_19_3.class);
73-
public static final ByteArrayType.OptionalByteArrayType OPTIONAL_SIGNATURE_BYTES_TYPE = new ByteArrayType.OptionalByteArrayType(256);
74-
public static final ByteArrayType SIGNATURE_BYTES_TYPE = new ByteArrayType(256);
7573
private final EntityPacketRewriter1_19_3 entityRewriter = new EntityPacketRewriter1_19_3(this);
7674
private final BlockItemPacketRewriter1_19_3 itemRewriter = new BlockItemPacketRewriter1_19_3(this);
7775
private final ParticleRewriter<ClientboundPackets1_19_3> particleRewriter = new ParticleRewriter<>(this);
@@ -227,9 +225,9 @@ public void register() {
227225
throw new RuntimeException(e);
228226
}
229227

230-
wrapper.write(Protocol1_19_3To1_19_1.OPTIONAL_SIGNATURE_BYTES_TYPE, signature); // Signature
228+
wrapper.write(Types.OPTIONAL_SIGNATURE_BYTES, signature); // Signature
231229
} else {
232-
wrapper.write(Protocol1_19_3To1_19_1.OPTIONAL_SIGNATURE_BYTES_TYPE, null); // Signature
230+
wrapper.write(Types.OPTIONAL_SIGNATURE_BYTES, null); // Signature
233231
}
234232

235233
//TODO is this fine (probably not)? same for chat_command
@@ -273,7 +271,7 @@ public void register() {
273271
}
274272

275273
wrapper.write(Types.STRING, argument.key());
276-
wrapper.write(Protocol1_19_3To1_19_1.SIGNATURE_BYTES_TYPE, signature);
274+
wrapper.write(Types.SIGNATURE_BYTES, signature);
277275
}
278276
} else {
279277
wrapper.write(Types.VAR_INT, 0); // No signatures
@@ -293,7 +291,7 @@ public void register() {
293291
public void register() {
294292
read(Types.UUID); // Sender
295293
read(Types.VAR_INT); // Index
296-
read(OPTIONAL_SIGNATURE_BYTES_TYPE); // Signature
294+
read(Types.OPTIONAL_SIGNATURE_BYTES); // Signature
297295
handler(wrapper -> {
298296
final String plainContent = wrapper.read(Types.STRING);
299297
wrapper.read(Types.LONG); // Timestamp
@@ -302,7 +300,7 @@ public void register() {
302300
for (int i = 0; i < lastSeen; i++) {
303301
final int index = wrapper.read(Types.VAR_INT);
304302
if (index == 0) {
305-
wrapper.read(SIGNATURE_BYTES_TYPE);
303+
wrapper.read(Types.SIGNATURE_BYTES);
306304
}
307305
}
308306

0 commit comments

Comments
 (0)