From 8054e0336d8fd8ae33ba83002f89773b561686a8 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 6 Apr 2021 23:52:20 -0300 Subject: [PATCH] mapping --- src/main/java/carpet/network/ClientNetworkHandler.java | 4 ++-- src/main/java/carpet/network/ServerNetworkHandler.java | 4 ++-- src/main/java/carpet/script/value/NBTSerializableValue.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/carpet/network/ClientNetworkHandler.java b/src/main/java/carpet/network/ClientNetworkHandler.java index 69867a9e..cf5b6379 100644 --- a/src/main/java/carpet/network/ClientNetworkHandler.java +++ b/src/main/java/carpet/network/ClientNetworkHandler.java @@ -129,7 +129,7 @@ public class ClientNetworkHandler private static void onSyncData(PacketByteBuf data, ClientPlayerEntity player) { - NbtCompound compound = data.readCompound(); + NbtCompound compound = data.readNbt(); if (compound == null) return; for (String key: compound.getKeys()) { @@ -149,7 +149,7 @@ public class ClientNetworkHandler outer.put("clientCommand", tag); CarpetClient.getPlayer().networkHandler.sendPacket(new CustomPayloadC2SPacket( CarpetClient.CARPET_CHANNEL, - (new PacketByteBuf(Unpooled.buffer())).writeVarInt(CarpetClient.DATA).writeCompound(outer) + (new PacketByteBuf(Unpooled.buffer())).writeVarInt(CarpetClient.DATA).writeNbt(outer) )); } } diff --git a/src/main/java/carpet/network/ServerNetworkHandler.java b/src/main/java/carpet/network/ServerNetworkHandler.java index 59a4b89d..a3f23622 100644 --- a/src/main/java/carpet/network/ServerNetworkHandler.java +++ b/src/main/java/carpet/network/ServerNetworkHandler.java @@ -138,7 +138,7 @@ public class ServerNetworkHandler private static void onClientData(ServerPlayerEntity player, PacketByteBuf data) { - NbtCompound compound = data.readCompound(); + NbtCompound compound = data.readNbt(); if (compound == null) return; for (String key: compound.getKeys()) { @@ -323,7 +323,7 @@ public class ServerNetworkHandler { PacketByteBuf packetBuf = new PacketByteBuf(Unpooled.buffer()); packetBuf.writeVarInt(CarpetClient.DATA); - packetBuf.writeCompound(tag); + packetBuf.writeNbt(tag); return packetBuf; } diff --git a/src/main/java/carpet/script/value/NBTSerializableValue.java b/src/main/java/carpet/script/value/NBTSerializableValue.java index 98bcf052..1e96d67a 100644 --- a/src/main/java/carpet/script/value/NBTSerializableValue.java +++ b/src/main/java/carpet/script/value/NBTSerializableValue.java @@ -290,7 +290,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa return new ItemStackArgument(res.getItem(), customTag); ItemStringReader parser = (new ItemStringReader(new StringReader(itemString), false)).consume(); - res = new ItemStackArgument(parser.getItem(), parser.getTag()); + res = new ItemStackArgument(parser.getItem(), parser.getNbt()); itemCache.put(itemString, res); if (itemCache.size()>64000) itemCache.clear();