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-rc1

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

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

@ -120,8 +120,10 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
}
@Override
public @Nullable Item handleItemToClient(final UserConnection connection, @Nullable final Item item) {
if (item == null) return null;
public Item handleItemToClient(final UserConnection connection, final Item item) {
if (item.isEmpty()) {
return item;
}
final StructuredDataContainer data = item.dataContainer();
data.setIdLookup(protocol, true);
@ -153,8 +155,10 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
}
@Override
public @Nullable Item handleItemToServer(final UserConnection connection, @Nullable final Item item) {
if (item == null) return null;
public Item handleItemToServer(final UserConnection connection, final Item item) {
if (item.isEmpty()) {
return item;
}
final StructuredDataContainer dataContainer = item.dataContainer();
dataContainer.setIdLookup(protocol, false);

7
common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/EntityPacketRewriter1_21.java
View File

@ -176,7 +176,6 @@ public final class EntityPacketRewriter1_21 extends EntityRewriter<ClientboundPa
data.setDataType(Types1_20_5.ENTITY_DATA_TYPES.byId(type.typeId()));
}
});
registerMetaTypeHandler1_20_3(
Types1_20_5.ENTITY_DATA_TYPES.itemType,
Types1_20_5.ENTITY_DATA_TYPES.blockStateType,
@ -186,11 +185,7 @@ public final class EntityPacketRewriter1_21 extends EntityRewriter<ClientboundPa
Types1_20_5.ENTITY_DATA_TYPES.componentType,
Types1_20_5.ENTITY_DATA_TYPES.optionalComponentType
);
filter().type(EntityTypes1_20_5.ABSTRACT_MINECART).index(11).handler((event, data) -> {
final int blockState = data.value();
data.setValue(protocol.getMappingData().getNewBlockStateId(blockState));
});
registerBlockStateHandler(EntityTypes1_20_5.ABSTRACT_MINECART, 11);
}
@Override

2
gradle.properties
View File

@ -1,4 +1,4 @@
projectVersion=5.0.0-1.21-pre3-SNAPSHOT
projectVersion=5.0.0-1.21-rc1-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-pre3-SNAPSHOT"
viaver = "5.0.0-1.21-rc1-SNAPSHOT"
# Common provided
netty = "4.0.20.Final"