Skip to content

Commit 757db4f

Browse files
committed
Update VV usage
1 parent 51f061b commit 757db4f

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/Protocol26_1To1_21_11.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,18 @@
2929
import com.viaversion.viabackwards.protocol.v26_1to1_21_11.storage.DayTimeStorage;
3030
import com.viaversion.viaversion.api.connection.UserConnection;
3131
import com.viaversion.viaversion.api.minecraft.RegistryType;
32+
import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_11;
3233
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_11;
34+
import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes1_21_11;
35+
import com.viaversion.viaversion.api.minecraft.entitydata.types.EntityDataTypes26_1;
3336
import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
3437
import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
3538
import com.viaversion.viaversion.api.type.Types;
3639
import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
3740
import com.viaversion.viaversion.api.type.types.chunk.ChunkType26_1;
41+
import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
42+
import com.viaversion.viaversion.api.type.types.version.Types26_1;
3843
import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
39-
import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
4044
import com.viaversion.viaversion.data.entity.EntityTrackerBase;
4145
import com.viaversion.viaversion.data.item.ItemHasherBase;
4246
import com.viaversion.viaversion.protocols.v1_21_11to26_1.Protocol1_21_11To26_1;
@@ -212,12 +216,12 @@ public TagRewriter<ClientboundPacket26_1> getTagRewriter() {
212216
}
213217

214218
@Override
215-
public VersionedTypesHolder types() {
219+
public Types26_1<StructuredDataKeys1_21_11, EntityDataTypes26_1> types() {
216220
return VersionedTypes.V26_1;
217221
}
218222

219223
@Override
220-
public VersionedTypesHolder mappedTypes() {
224+
public Types1_20_5<StructuredDataKeys1_21_11, EntityDataTypes1_21_11> mappedTypes() {
221225
return VersionedTypes.V1_21_11;
222226
}
223227

common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/rewriter/BlockItemPacketRewriter26_1.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ public BlockItemPacketRewriter26_1(final Protocol26_1To1_21_11 protocol) {
3939
@Override
4040
protected void handleItemDataComponentsToClient(final UserConnection connection, final Item item, final StructuredDataContainer container) {
4141
super.handleItemDataComponentsToClient(connection, item, container);
42-
downgradeData(container);
42+
downgradeData(protocol.mappedTypes().structuredDataKeys(), container);
4343
}
4444

4545
@Override
4646
protected void handleItemDataComponentsToServer(final UserConnection connection, final Item item, final StructuredDataContainer container) {
4747
super.handleItemDataComponentsToServer(connection, item, container);
48-
upgradeData(protocol, container);
48+
upgradeData(protocol, protocol.types().structuredDataKeys(), container);
4949
}
5050

5151
@Override

0 commit comments

Comments
 (0)