Mirrors/ViaBackwards
3
0
Fork 0
Mirror von https://github.com/ViaVersion/ViaBackwards.git synchronisiert 2024-12-26 00:00:33 +01:00
Code Issues Releases Aktivität

1.21-pre3

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nassim Jahnke 2024-06-06 10:31:44 +02:00
Ursprung 335415efd7
Commit 6d8fee053d
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: EF6771C01F6EF02F
4 geänderte Dateien mit 7 neuen und 7 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
Datei anzeigen

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

6
common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java
Datei anzeigen

@ -123,7 +123,7 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
public @Nullable Item handleItemToClient(final UserConnection connection, @Nullable final Item item) { public @Nullable Item handleItemToClient(final UserConnection connection, @Nullable final Item item) {
if (item == null) return null; if (item == null) return null;
final StructuredDataContainer data = item.structuredData(); final StructuredDataContainer data = item.dataContainer();
data.setIdLookup(protocol, true); data.setIdLookup(protocol, true);
data.replaceKey(StructuredDataKey.FOOD1_21, StructuredDataKey.FOOD1_20_5); 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) { public @Nullable Item handleItemToServer(final UserConnection connection, @Nullable final Item item) {
if (item == null) return null; if (item == null) return null;
final StructuredDataContainer dataContainer = item.structuredData(); final StructuredDataContainer dataContainer = item.dataContainer();
dataContainer.setIdLookup(protocol, false); dataContainer.setIdLookup(protocol, false);
dataContainer.replaceKey(StructuredDataKey.FOOD1_20_5, StructuredDataKey.FOOD1_21); 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) { 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) { if (enchantmentsData == null) {
return; return;
} }

2
gradle.properties
Datei anzeigen

@ -1,4 +1,4 @@
projectVersion=5.0.0-1.21-pre2-SNAPSHOT projectVersion=5.0.0-1.21-pre3-SNAPSHOT
# Smile emoji # 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 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
Datei anzeigen

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