Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-26 03:55:28 +01:00
Code Issues Projects Releases Wiki Activity

Fix MetaTypes1_20_2 item type

Browse Source
This commit is contained in:
Nassim Jahnke 2023-08-31 11:44:55 +10:00
parent a9288ebd3a
commit 625373827c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/viaversion/viaversion/api/minecraft/metadata/types/MetaTypes1_20_2.java
View File

@ -35,7 +35,7 @@ public final class MetaTypes1_20_2 extends AbstractMetaTypes {
public final MetaType stringType = add(4, Type.STRING); public final MetaType stringType = add(4, Type.STRING);
public final MetaType componentType = add(5, Type.COMPONENT); public final MetaType componentType = add(5, Type.COMPONENT);
public final MetaType optionalComponentType = add(6, Type.OPTIONAL_COMPONENT); public final MetaType optionalComponentType = add(6, Type.OPTIONAL_COMPONENT);
public final MetaType itemType = add(7, Type.FLAT_VAR_INT_ITEM); public final MetaType itemType = add(7, Type.ITEM1_20_2);
public final MetaType booleanType = add(8, Type.BOOLEAN); public final MetaType booleanType = add(8, Type.BOOLEAN);
public final MetaType rotationType = add(9, Type.ROTATION); public final MetaType rotationType = add(9, Type.ROTATION);
public final MetaType positionType = add(10, Type.POSITION1_14); public final MetaType positionType = add(10, Type.POSITION1_14);

10
common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
View File

@ -311,7 +311,7 @@ public abstract class ItemRewriter<C extends ClientboundPacketType, S extends Se
}); });
} }
public void registerAdvancements1_20(C packetType) { public void registerAdvancements1_20_2(C packetType) {
protocol.registerClientbound(packetType, wrapper -> { protocol.registerClientbound(packetType, wrapper -> {
wrapper.passthrough(Type.BOOLEAN); // Reset/clear wrapper.passthrough(Type.BOOLEAN); // Reset/clear
int size = wrapper.passthrough(Type.VAR_INT); // Mapping size int size = wrapper.passthrough(Type.VAR_INT); // Mapping size
@ -336,11 +336,9 @@ public abstract class ItemRewriter<C extends ClientboundPacketType, S extends Se
wrapper.passthrough(Type.FLOAT); // Y wrapper.passthrough(Type.FLOAT); // Y
} }
wrapper.passthrough(Type.STRING_ARRAY); // Criteria int requirements = wrapper.passthrough(Type.VAR_INT);
for (int array = 0; array < requirements; array++) {
int arrayLength = wrapper.passthrough(Type.VAR_INT); wrapper.passthrough(Type.STRING_ARRAY);
for (int array = 0; array < arrayLength; array++) {
wrapper.passthrough(Type.STRING_ARRAY); // String array
} }
wrapper.passthrough(Type.BOOLEAN); // Send telemetry wrapper.passthrough(Type.BOOLEAN); // Send telemetry