Skip to content

Commit fba5a1c

Browse files
Compile against master branch of VV
1 parent 8d35b00 commit fba5a1c

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/types/item/CompressedNBTType.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.item;
2020

2121
import com.viaversion.viaversion.api.type.Type;
22-
import com.viaversion.viaversion.libs.opennbt.NBTIO;
2322
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
23+
import com.viaversion.viaversion.libs.opennbt.tag.io.NBTIO;
2424
import io.netty.buffer.ByteBuf;
2525
import io.netty.buffer.ByteBufInputStream;
2626
import io.netty.buffer.ByteBufOutputStream;
@@ -44,7 +44,7 @@ public CompoundTag read(ByteBuf buffer) throws IOException {
4444
ByteBuf compressed = buffer.readSlice(length);
4545

4646
try (GZIPInputStream gzipStream = new GZIPInputStream(new ByteBufInputStream(compressed))) {
47-
return NBTIO.readTag(gzipStream);
47+
return NBTIO.reader(CompoundTag.class).read(gzipStream);
4848
}
4949
}
5050

@@ -58,7 +58,7 @@ public void write(ByteBuf buffer, CompoundTag nbt) throws Exception {
5858
ByteBuf compressedBuf = buffer.alloc().buffer();
5959
try {
6060
try (GZIPOutputStream gzipStream = new GZIPOutputStream(new ByteBufOutputStream(compressedBuf))) {
61-
NBTIO.writeTag(gzipStream, nbt);
61+
NBTIO.writer().write(gzipStream, nbt);
6262
}
6363

6464
buffer.writeShort(compressedBuf.readableBytes());

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/types/item/NBTType.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
package com.viaversion.viarewind.protocol.protocol1_7_6_10to1_8.types.item;
2020

2121
import com.viaversion.viaversion.api.type.Type;
22-
import com.viaversion.viaversion.libs.opennbt.NBTIO;
2322
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
23+
import com.viaversion.viaversion.libs.opennbt.tag.io.NBTIO;
2424
import io.netty.buffer.ByteBuf;
2525
import io.netty.buffer.ByteBufInputStream;
2626
import io.netty.buffer.ByteBufOutputStream;
@@ -41,7 +41,7 @@ public CompoundTag read(ByteBuf buffer) {
4141
ByteBufInputStream byteBufInputStream = new ByteBufInputStream(buffer);
4242
DataInputStream dataInputStream = new DataInputStream(byteBufInputStream);
4343
try {
44-
return NBTIO.readTag((DataInput) dataInputStream);
44+
return NBTIO.reader(CompoundTag.class).read((DataInput) dataInputStream);
4545
} catch (Throwable throwable) {
4646
throwable.printStackTrace();
4747
} finally {
@@ -62,7 +62,7 @@ public void write(ByteBuf buffer, CompoundTag nbt) throws Exception {
6262
ByteBuf buf = buffer.alloc().buffer();
6363
ByteBufOutputStream byteBufStream = new ByteBufOutputStream(buf);
6464
DataOutputStream dataOutputStream = new DataOutputStream(byteBufStream);
65-
NBTIO.writeTag((DataOutput) dataOutputStream, nbt);
65+
NBTIO.writer().write((DataOutput) dataOutputStream, nbt);
6666
dataOutputStream.close();
6767
buffer.writeShort(buf.readableBytes());
6868
buffer.writeBytes(buf);

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/rewriter/ReplacementItemRewriter1_8.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public Item handleItemToClient(Item item) {
170170
}
171171

172172
if (tag.contains("AttributeModifiers")) {
173-
viaVersionTag.put("AttributeModifiers", tag.get("AttributeModifiers").clone());
173+
viaVersionTag.put("AttributeModifiers", tag.get("AttributeModifiers").copy());
174174
}
175175

176176
if (item.identifier() == 383 && item.data() == 0) {
@@ -281,7 +281,7 @@ public Item handleItemToServer(Item item) {
281281
if (viaVersionTag.contains("noDisplay")) tag.remove("display");
282282

283283
if (viaVersionTag.contains("Unbreakable")) {
284-
tag.put("Unbreakable", viaVersionTag.get("Unbreakable").clone());
284+
tag.put("Unbreakable", viaVersionTag.get("Unbreakable").copy());
285285
}
286286

287287
if (viaVersionTag.contains("displayName")) {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ maven_version=3.0.6-SNAPSHOT
77
maven_group=com.viaversion
88

99
# libraries
10-
viaversion_version=4.10.0-23w51b-SNAPSHOT
10+
viaversion_version=4.9.3-SNAPSHOT
1111
netty_version=4.0.20.Final
1212
guava_version=17.0
1313

0 commit comments

Comments
 (0)