Skip to content

Commit c2f19c6

Browse files
FlorianMichaelFlorianMichael
committed
Replaced deprecated API usage
1 parent b0e7a20 commit c2f19c6

File tree

7 files changed

+30
-30
lines changed

7 files changed

+30
-30
lines changed

‎common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/EntityPackets.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static void register(Protocol1_7_6_10To1_8 protocol) {
4343
public void register() {
4444
map(Type.VAR_INT, Type.INT); // entity id
4545
map(Type.SHORT); // slot
46-
map(Type.ITEM, Types1_7_6_10.COMPRESSED_NBT_ITEM); // item
46+
map(Type.ITEM1_8, Types1_7_6_10.COMPRESSED_NBT_ITEM); // item
4747

4848
// remap item
4949
handler(wrapper -> {

‎common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/InventoryPackets.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void register() {
8686
}
8787
});
8888

89-
map(Type.ITEM, Types1_7_6_10.COMPRESSED_NBT_ITEM); // item
89+
map(Type.ITEM1_8, Types1_7_6_10.COMPRESSED_NBT_ITEM); // item
9090

9191
// remap item
9292
handler(wrapper -> {
@@ -123,7 +123,7 @@ public void register() {
123123
handler(wrapper -> {
124124
final short windowType = wrapper.user().get(InventoryTracker.class).get(wrapper.get(Type.UNSIGNED_BYTE, 0));
125125

126-
Item[] items = wrapper.read(Type.ITEM_ARRAY);
126+
Item[] items = wrapper.read(Type.ITEM1_8_SHORT_ARRAY);
127127
if (windowType == 4) { // Enchantment Table
128128
Item[] old = items;
129129
items = new Item[old.length - 1];
@@ -240,13 +240,13 @@ public void register() {
240240
map(Type.BYTE); // button
241241
map(Type.SHORT); // action number
242242
map(Type.BYTE); // mode
243-
map(Types1_7_6_10.COMPRESSED_NBT_ITEM, Type.ITEM); // clicked item
243+
map(Types1_7_6_10.COMPRESSED_NBT_ITEM, Type.ITEM1_8); // clicked item
244244

245245
// remap item
246246
handler(wrapper -> {
247-
final Item item = wrapper.get(Type.ITEM, 0);
247+
final Item item = wrapper.get(Type.ITEM1_8, 0);
248248
protocol.getItemRewriter().handleItemToServer(item);
249-
wrapper.set(Type.ITEM, 0, item);
249+
wrapper.set(Type.ITEM1_8, 0, item);
250250
});
251251
}
252252
});
@@ -255,13 +255,13 @@ public void register() {
255255
@Override
256256
public void register() {
257257
map(Type.SHORT); // slot
258-
map(Types1_7_6_10.COMPRESSED_NBT_ITEM, Type.ITEM); // item
258+
map(Types1_7_6_10.COMPRESSED_NBT_ITEM, Type.ITEM1_8); // item
259259

260260
// remap item
261261
handler(wrapper -> {
262-
final Item item = wrapper.get(Type.ITEM, 0);
262+
final Item item = wrapper.get(Type.ITEM1_8, 0);
263263
protocol.getItemRewriter().handleItemToServer(item);
264-
wrapper.set(Type.ITEM, 0, item);
264+
wrapper.set(Type.ITEM1_8, 0, item);
265265
});
266266
}
267267
});

‎common/src/main/java/com/viaversion/viarewind/protocol/protocol1_7_6_10to1_8/packets/PlayerPackets.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -410,15 +410,15 @@ public void register() {
410410
}
411411

412412
for (int i = 0; i < size; i++) {
413-
Item item = protocol.getItemRewriter().handleItemToClient(packetWrapper.read(Type.ITEM));
413+
Item item = protocol.getItemRewriter().handleItemToClient(packetWrapper.read(Type.ITEM1_8));
414414
packetWrapper.write(Types1_7_6_10.COMPRESSED_NBT_ITEM, item); //Buy Item 1
415415

416-
item = protocol.getItemRewriter().handleItemToClient(packetWrapper.read(Type.ITEM));
416+
item = protocol.getItemRewriter().handleItemToClient(packetWrapper.read(Type.ITEM1_8));
417417
packetWrapper.write(Types1_7_6_10.COMPRESSED_NBT_ITEM, item); //Buy Item 3
418418

419419
boolean has3Items = packetWrapper.passthrough(Type.BOOLEAN);
420420
if (has3Items) {
421-
item = protocol.getItemRewriter().handleItemToClient(packetWrapper.read(Type.ITEM));
421+
item = protocol.getItemRewriter().handleItemToClient(packetWrapper.read(Type.ITEM1_8));
422422
packetWrapper.write(Types1_7_6_10.COMPRESSED_NBT_ITEM, item); //Buy Item 2
423423
}
424424

@@ -676,7 +676,7 @@ public void register() {
676676
packetWrapper.passthrough(Type.BYTE); //Direction
677677
Item item = packetWrapper.read(Types1_7_6_10.COMPRESSED_NBT_ITEM);
678678
item = protocol.getItemRewriter().handleItemToServer(item);
679-
packetWrapper.write(Type.ITEM, item);
679+
packetWrapper.write(Type.ITEM1_8, item);
680680

681681
for (int i = 0; i < 3; i++) {
682682
packetWrapper.passthrough(Type.BYTE);
@@ -890,7 +890,7 @@ public void register() {
890890
page.setValue(value);
891891
}
892892
}
893-
packetWrapper.write(Type.ITEM, book);
893+
packetWrapper.write(Type.ITEM1_8, book);
894894
break;
895895
}
896896
case "MC|Brand": {

‎common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/packets/EntityPackets.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,8 @@ public void register() {
326326
}
327327
packetWrapper.write(Type.SHORT, (short) slot);
328328
});
329-
map(Type.ITEM);
330-
handler(packetWrapper -> packetWrapper.set(Type.ITEM, 0, protocol.getItemRewriter().handleItemToClient(packetWrapper.get(Type.ITEM, 0))));
329+
map(Type.ITEM1_8);
330+
handler(packetWrapper -> packetWrapper.set(Type.ITEM1_8, 0, protocol.getItemRewriter().handleItemToClient(packetWrapper.get(Type.ITEM1_8, 0))));
331331
}
332332
});
333333

‎common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/packets/InventoryPackets.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void register() {
7878
map(Type.UNSIGNED_BYTE);
7979
handler(packetWrapper -> {
8080
short windowId = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
81-
Item[] items = packetWrapper.read(Type.ITEM_ARRAY);
81+
Item[] items = packetWrapper.read(Type.ITEM1_8_SHORT_ARRAY);
8282
for (int i = 0; i < items.length; i++) {
8383
items[i] = protocol.getItemRewriter().handleItemToClient(items[i]);
8484
}
@@ -97,7 +97,7 @@ public void register() {
9797
System.arraycopy(old, 5, items, 4, old.length - 5);
9898
}
9999
}
100-
packetWrapper.write(Type.ITEM_ARRAY, items);
100+
packetWrapper.write(Type.ITEM1_8_SHORT_ARRAY, items);
101101
});
102102
}
103103
});
@@ -110,9 +110,9 @@ public void register() {
110110
public void register() {
111111
map(Type.UNSIGNED_BYTE);
112112
map(Type.SHORT);
113-
map(Type.ITEM);
113+
map(Type.ITEM1_8);
114114
handler(packetWrapper -> {
115-
packetWrapper.set(Type.ITEM, 0, protocol.getItemRewriter().handleItemToClient(packetWrapper.get(Type.ITEM, 0)));
115+
packetWrapper.set(Type.ITEM1_8, 0, protocol.getItemRewriter().handleItemToClient(packetWrapper.get(Type.ITEM1_8, 0)));
116116
byte windowId = packetWrapper.get(Type.UNSIGNED_BYTE, 0).byteValue();
117117
short slot = packetWrapper.get(Type.SHORT, 0);
118118
if (windowId == 0 && slot == 45) {
@@ -126,9 +126,9 @@ public void register() {
126126
packetWrapper.set(Type.SHORT, 0, slot -= 1);
127127
} else if (slot == 4) {
128128
packetWrapper.cancel();
129-
Windows.updateBrewingStand(packetWrapper.user(), packetWrapper.get(Type.ITEM, 0), windowId);
129+
Windows.updateBrewingStand(packetWrapper.user(), packetWrapper.get(Type.ITEM1_8, 0), windowId);
130130
} else {
131-
packetWrapper.user().get(Windows.class).getBrewingItems(windowId)[slot] = packetWrapper.get(Type.ITEM, 0);
131+
packetWrapper.user().get(Windows.class).getBrewingItems(windowId)[slot] = packetWrapper.get(Type.ITEM1_8, 0);
132132
}
133133
}
134134
});
@@ -158,8 +158,8 @@ public void register() {
158158
map(Type.BYTE);
159159
map(Type.SHORT);
160160
map(Type.BYTE, Type.VAR_INT);
161-
map(Type.ITEM);
162-
handler(packetWrapper -> packetWrapper.set(Type.ITEM, 0, protocol.getItemRewriter().handleItemToServer(packetWrapper.get(Type.ITEM, 0))));
161+
map(Type.ITEM1_8);
162+
handler(packetWrapper -> packetWrapper.set(Type.ITEM1_8, 0, protocol.getItemRewriter().handleItemToServer(packetWrapper.get(Type.ITEM1_8, 0))));
163163
handler(packetWrapper -> {
164164
short windowId = packetWrapper.get(Type.UNSIGNED_BYTE, 0);
165165
Windows windows = packetWrapper.user().get(Windows.class);
@@ -179,8 +179,8 @@ public void register() {
179179
@Override
180180
public void register() {
181181
map(Type.SHORT);
182-
map(Type.ITEM);
183-
handler(packetWrapper -> packetWrapper.set(Type.ITEM, 0, protocol.getItemRewriter().handleItemToServer(packetWrapper.get(Type.ITEM, 0))));
182+
map(Type.ITEM1_8);
183+
handler(packetWrapper -> packetWrapper.set(Type.ITEM1_8, 0, protocol.getItemRewriter().handleItemToServer(packetWrapper.get(Type.ITEM1_8, 0))));
184184
}
185185
});
186186
}

‎common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/packets/PlayerPackets.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ public void register() {
9999
final ItemRewriter<?> itemRewriter = protocol.getItemRewriter();
100100

101101
for (int i = 0; i < size; i++) {
102-
packetWrapper.write(Type.ITEM, itemRewriter.handleItemToClient(packetWrapper.read(Type.ITEM))); //Buy Item 1
103-
packetWrapper.write(Type.ITEM, itemRewriter.handleItemToClient(packetWrapper.read(Type.ITEM))); //Buy Item 3
102+
packetWrapper.write(Type.ITEM1_8, itemRewriter.handleItemToClient(packetWrapper.read(Type.ITEM1_8))); //Buy Item 1
103+
packetWrapper.write(Type.ITEM1_8, itemRewriter.handleItemToClient(packetWrapper.read(Type.ITEM1_8))); //Buy Item 3
104104

105105
boolean has3Items = packetWrapper.passthrough(Type.BOOLEAN);
106106
if (has3Items) {
107-
packetWrapper.write(Type.ITEM, itemRewriter.handleItemToClient(packetWrapper.read(Type.ITEM))); //Buy Item 2
107+
packetWrapper.write(Type.ITEM1_8, itemRewriter.handleItemToClient(packetWrapper.read(Type.ITEM1_8))); //Buy Item 2
108108
}
109109

110110
packetWrapper.passthrough(Type.BOOLEAN); //Unavailable

‎common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/storage/Windows.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public static void updateBrewingStand(UserConnection user, Item blazePowder, sho
8383
PacketWrapper setSlot = PacketWrapper.create(ClientboundPackets1_8.SET_SLOT, user);
8484
setSlot.write(Type.UNSIGNED_BYTE, windowId);
8585
setSlot.write(Type.SHORT, (short) i);
86-
setSlot.write(Type.ITEM, items[i]);
86+
setSlot.write(Type.ITEM1_8, items[i]);
8787
PacketUtil.sendPacket(setSlot, Protocol1_8To1_9.class);
8888
}
8989
}

0 commit comments

Comments
 (0)