Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-06-26 10:25:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

1.21-pre3

Browse Source
This commit is contained in:
Nassim Jahnke 2024-06-06 10:31:44 +02:00
parent 335415efd7
commit 6d8fee053d
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
View File

@ -331,7 +331,7 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
return null;
}
item.structuredData().setIdLookup(protocol, true);
item.dataContainer().setIdLookup(protocol, true);
enchantmentRewriter.handleToClient(item);
super.handleItemToClient(connection, item);
@ -360,7 +360,7 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
// Convert to structured item first
final Item structuredItem = vvProtocol.getItemRewriter().toStructuredItem(connection, item);
structuredItem.structuredData().setIdLookup(protocol, false);
structuredItem.dataContainer().setIdLookup(protocol, false);
enchantmentRewriter.handleToServer(structuredItem);
return super.handleItemToServer(connection, structuredItem);

6
common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java
View File

@ -123,7 +123,7 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
public @Nullable Item handleItemToClient(final UserConnection connection, @Nullable final Item item) {
if (item == null) return null;
final StructuredDataContainer data = item.structuredData();
final StructuredDataContainer data = item.dataContainer();
data.setIdLookup(protocol, true);
data.replaceKey(StructuredDataKey.FOOD1_21, StructuredDataKey.FOOD1_20_5);
@ -156,7 +156,7 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
public @Nullable Item handleItemToServer(final UserConnection connection, @Nullable final Item item) {
if (item == null) return null;
final StructuredDataContainer dataContainer = item.structuredData();
final StructuredDataContainer dataContainer = item.dataContainer();
dataContainer.setIdLookup(protocol, false);
dataContainer.replaceKey(StructuredDataKey.FOOD1_20_5, StructuredDataKey.FOOD1_21);
@ -175,7 +175,7 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
}
private void rewriteEnchantmentToServer(final EnchantmentsPaintingsStorage storage, final Item item, final StructuredDataKey<Enchantments> key) {
final StructuredData<Enchantments> enchantmentsData = item.structuredData().getNonEmpty(key);
final StructuredData<Enchantments> enchantmentsData = item.dataContainer().getNonEmpty(key);
if (enchantmentsData == null) {
return;
}

2
gradle.properties
View File

@ -1,4 +1,4 @@
projectVersion=5.0.0-1.21-pre2-SNAPSHOT
projectVersion=5.0.0-1.21-pre3-SNAPSHOT
# Smile emoji
mcVersions=1.20.6,1.20.5,1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10

2
gradle/libs.versions.toml
View File

@ -3,7 +3,7 @@ metadata.format.version = "1.1"
[versions]
# ViaVersion
viaver = "5.0.0-1.21-pre2-SNAPSHOT"
viaver = "5.0.0-1.21-pre3-SNAPSHOT"
# Common provided
netty = "4.0.20.Final"