Skip to content

Commit a8cd653

Browse files
Remove serialize versions from item hasher (#1102)
1 parent 191dd24 commit a8cd653

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

common/src/main/java/com/viaversion/viabackwards/protocol/template/Protocol1_99To1_98.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
// ServerboundConfigurationPackets1_20_5
5353
// EntityTypes1_21_4 (UNMAPPED type)
5454
// VersionedTypes.V1_21_5
55-
// SerializerVersion.V1_21_5
5655
// 1.99, 1.98
5756
final class Protocol1_99To1_98 extends BackwardsProtocol<ClientboundPacket1_21_2, ClientboundPacket1_21_2, ServerboundPacket1_21_4, ServerboundPacket1_21_4> {
5857

@@ -106,7 +105,7 @@ protected void registerPackets() {
106105
@Override
107106
public void init(final UserConnection connection) {
108107
addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_4.PLAYER));
109-
addItemHasher(connection, new ItemHasherBase(this, connection, SerializerVersion.V1_21_5, SerializerVersion.V1_21_5));
108+
addItemHasher(connection, new ItemHasherBase(this, connection));
110109
}
111110

112111
@Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_5to1_21_4/storage/HashedItemConverterStorage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.viaversion.viaversion.codec.CodecRegistryContext;
2626
import com.viaversion.viaversion.codec.hash.HashFunction;
2727
import com.viaversion.viaversion.codec.hash.HashOps;
28-
import com.viaversion.viaversion.util.SerializerVersion;
2928
import java.util.ArrayList;
3029
import java.util.List;
3130

@@ -36,7 +35,7 @@ public class HashedItemConverterStorage implements StorableObject {
3635

3736
public HashedItemConverterStorage(final Protocol<?, ?, ?, ?> protocol) {
3837
final RegistryAccess registryAccess = RegistryAccess.of(this.enchantments, protocol.getMappingData());
39-
final CodecContext context = new CodecRegistryContext(protocol, SerializerVersion.V1_21_5, SerializerVersion.V1_21_5, registryAccess, false);
38+
final CodecContext context = new CodecRegistryContext(protocol, registryAccess, false);
4039
this.hasher = new HashOps(context, HashFunction.CRC32C);
4140
}
4241

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_6to1_21_5/Protocol1_21_6To1_21_5.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
import com.viaversion.viaversion.rewriter.StatisticsRewriter;
6565
import com.viaversion.viaversion.rewriter.TagRewriter;
6666
import com.viaversion.viaversion.util.Key;
67-
import com.viaversion.viaversion.util.SerializerVersion;
6867

6968
import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
7069

@@ -316,7 +315,7 @@ private void storeServerLinks(final PacketWrapper wrapper) {
316315
@Override
317316
public void init(final UserConnection user) {
318317
addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_21_6.PLAYER));
319-
addItemHasher(user, new ItemHasherBase(this, user, SerializerVersion.V1_21_6, SerializerVersion.V1_21_5));
318+
addItemHasher(user, new ItemHasherBase(this, user));
320319
user.put(new RegistryAndTags());
321320
user.put(new ClickEvents());
322321
}

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_7to1_21_6/Protocol1_21_7To1_21_6.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import com.viaversion.viaversion.rewriter.ParticleRewriter;
4545
import com.viaversion.viaversion.rewriter.StatisticsRewriter;
4646
import com.viaversion.viaversion.rewriter.TagRewriter;
47-
import com.viaversion.viaversion.util.SerializerVersion;
4847

4948
import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
5049

@@ -95,7 +94,7 @@ protected void registerPackets() {
9594
@Override
9695
public void init(final UserConnection connection) {
9796
addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_6.PLAYER));
98-
addItemHasher(connection, new ItemHasherBase(this, connection, SerializerVersion.V1_21_6, SerializerVersion.V1_21_6));
97+
addItemHasher(connection, new ItemHasherBase(this, connection));
9998
}
10099

101100
@Override

0 commit comments

Comments
 (0)