Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-28 08:32:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temp fix for RecipesTest and fix ItemStack size encoding.

Browse source
This commit is contained in:
basaigh 2024-10-16 18:42:13 +01:00
parent eb64c3850c
commit ca629e2fef
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodecHelper.java
View file

@ -336,7 +336,7 @@ public class MinecraftCodecHelper extends BasePacketCodecHelper {
@Nullable @Nullable
public ItemStack readOptionalItemStack(ByteBuf buf) { public ItemStack readOptionalItemStack(ByteBuf buf) {
byte count = buf.readByte(); int count = this.readVarInt(buf);
if (count <= 0) { if (count <= 0) {
return null; return null;
} }
@ -347,7 +347,7 @@ public class MinecraftCodecHelper extends BasePacketCodecHelper {
public void writeOptionalItemStack(ByteBuf buf, ItemStack item) { public void writeOptionalItemStack(ByteBuf buf, ItemStack item) {
boolean empty = item == null || item.getAmount() <= 0; boolean empty = item == null || item.getAmount() <= 0;
buf.writeByte(!empty ? item.getAmount() : 0); this.writeVarInt(buf, !empty ? item.getAmount() : 0);
if (!empty) { if (!empty) {
this.writeVarInt(buf, item.getId()); this.writeVarInt(buf, item.getId());
this.writeDataComponentPatch(buf, item.getDataComponents()); this.writeDataComponentPatch(buf, item.getDataComponents());

4
protocol/src/test/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ServerDeclareRecipesTest.java
View file

@ -26,12 +26,12 @@ public class ServerDeclareRecipesTest extends PacketTest {
this.setPackets( this.setPackets(
new ClientboundUpdateRecipesPacket( new ClientboundUpdateRecipesPacket(
new HashMap<>(){{ new HashMap<>(){{
put(Key.key("smithing_addition"), new int[]{829, 837, 833, 830, 831, 671, 827, 828, 835, 838}); // put(Key.key("smithing_addition"), new int[]{829, 837, 833, 830, 831, 671, 827, 828, 835, 838}); // Uncomment when Key comparison works
}}, }},
new ArrayList<>(){{ new ArrayList<>(){{
add(new ClientboundUpdateRecipesPacket.SelectableRecipe( add(new ClientboundUpdateRecipesPacket.SelectableRecipe(
new Ingredient(new HolderSet(new int[]{6})), new Ingredient(new HolderSet(new int[]{6})),
new ItemStackSlotDisplay(new ItemStack(2, 662, null)) new ItemStackSlotDisplay(new ItemStack(662, 2, null))
)); ));
}} }}
) )