Skip to content

Commit 82a7c9b

Browse files
committed
Update VV usage
1 parent 3a67be7 commit 82a7c9b

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
public interface ViaBackwardsPlatform {
7373

74-
String MINIMUM_VV_VERSION = "5.1.1";
74+
String MINIMUM_VV_VERSION = "5.1.2";
7575

7676
/**
7777
* Initialize ViaBackwards.

common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ protected PacketHandler getTrackerHandler() {
240240
}
241241

242242
protected PacketHandler getTrackerHandler(EntityType entityType) {
243-
return wrapper -> tracker(wrapper.user()).addEntity((int) wrapper.get(Types.VAR_INT, 0), entityType);
243+
return wrapper -> tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), entityType);
244244
}
245245

246246
protected PacketHandler getPlayerTrackerHandler() {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/PlayerPacketRewriter1_13.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ public void register() {
469469
wrapper.write(Types.STRING, newChannel);
470470

471471
if (newChannel.equals("minecraft:register") || newChannel.equals("minecraft:unregister")) {
472-
String[] channels = new String(wrapper.read(Types.REMAINING_BYTES), StandardCharsets.UTF_8).split("\0");
472+
String[] channels = new String(wrapper.read(Types.SERVERBOUND_CUSTOM_PAYLOAD_DATA), StandardCharsets.UTF_8).split("\0");
473473
List<String> rewrittenChannels = new ArrayList<>();
474474
for (String s : channels) {
475475
String rewritten = ItemPacketRewriter1_13.getNewPluginChannelId(s);
@@ -480,7 +480,7 @@ public void register() {
480480
}
481481
}
482482
if (!rewrittenChannels.isEmpty()) {
483-
wrapper.write(Types.REMAINING_BYTES, Joiner.on('\0').join(rewrittenChannels).getBytes(StandardCharsets.UTF_8));
483+
wrapper.write(Types.SERVERBOUND_CUSTOM_PAYLOAD_DATA, Joiner.on('\0').join(rewrittenChannels).getBytes(StandardCharsets.UTF_8));
484484
} else {
485485
wrapper.cancel();
486486
}

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/BlockItemPacketRewriter1_21_2.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.viaversion.viaversion.rewriter.BlockRewriter;
3939
import com.viaversion.viaversion.rewriter.SoundRewriter;
4040
import com.viaversion.viaversion.util.Key;
41+
import com.viaversion.viaversion.util.Limit;
4142

4243
import static com.viaversion.viaversion.protocols.v1_21to1_21_2.rewriter.BlockItemPacketRewriter1_21_2.downgradeItemData;
4344
import static com.viaversion.viaversion.protocols.v1_21to1_21_2.rewriter.BlockItemPacketRewriter1_21_2.updateItemData;
@@ -143,7 +144,7 @@ public void registerPackets() {
143144
wrapper.passthrough(Types.SHORT); // Slot
144145
wrapper.passthrough(Types.BYTE); // Button
145146
wrapper.passthrough(Types.VAR_INT); // Mode
146-
final int length = wrapper.passthrough(Types.VAR_INT);
147+
final int length = Limit.max(wrapper.passthrough(Types.VAR_INT), 128);
147148
for (int i = 0; i < length; i++) {
148149
wrapper.passthrough(Types.SHORT); // Slot
149150
passthroughServerboundItem(wrapper);

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
33
[versions]
44

55
# ViaVersion
6-
viaver = "5.1.1"
6+
viaver = "5.1.2-SNAPSHOT"
77

88
# Common provided
99
netty = "4.0.20.Final"

0 commit comments

Comments
 (0)