From 0d1c553ee1b9c3167432f58407a94dd389dd2057 Mon Sep 17 00:00:00 2001 From: FlorianMichael Date: Sat, 1 Jun 2024 00:34:15 +0200 Subject: [PATCH] Update VV API usage --- .../fabric/mc1122/providers/VFHandItemProvider.java | 6 +++--- .../fabric/mc1144/providers/VFHandItemProvider.java | 4 ++-- .../fabric/mc1152/providers/VFHandItemProvider.java | 4 ++-- .../fabric/mc1165/providers/VFHandItemProvider.java | 4 ++-- .../fabric/mc1171/providers/VFHandItemProvider.java | 4 ++-- .../fabric/mc1182/providers/VFHandItemProvider.java | 4 ++-- .../fabric/mc1194/providers/VFHandItemProvider.java | 4 ++-- .../fabric/mc1201/providers/VFHandItemProvider.java | 4 ++-- .../fabric/mc1204/providers/VFHandItemProvider.java | 4 ++-- .../fabric/mc1206/providers/VFHandItemProvider.java | 4 ++-- .../fabric/mc189/providers/VFHandItemProvider.java | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/providers/VFHandItemProvider.java b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/providers/VFHandItemProvider.java index 647a4aa..fbded5a 100644 --- a/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/providers/VFHandItemProvider.java +++ b/viafabric-mc1122/src/main/java/com/viaversion/fabric/mc1122/providers/VFHandItemProvider.java @@ -45,16 +45,16 @@ public class VFHandItemProvider extends HandItemProvider { if (info.isClientSide()) { return getClientItem(); } else if ((serverItem = serverPlayers.get(info.getProtocolInfo().getUuid())) != null) { - return new DataItem(serverItem); + return serverItem.copy(); } return super.getHandItem(info); } private Item getClientItem() { if (clientItem == null) { - return new DataItem(0, (byte) 0, (short) 0, null); + return new DataItem(0, (byte) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT) diff --git a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFHandItemProvider.java b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFHandItemProvider.java index 01b0763..6af7712 100644 --- a/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFHandItemProvider.java +++ b/viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFHandItemProvider.java @@ -46,9 +46,9 @@ public class VFHandItemProvider extends HandItemProvider private Item getClientItem() { if (clientItem == null) { - return new DataItem(0, (byte) 0, (short) 0, null); + return new DataItem(0, (byte) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT) diff --git a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/VFHandItemProvider.java b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/VFHandItemProvider.java index 9bb702c..4a2d5d3 100644 --- a/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/VFHandItemProvider.java +++ b/viafabric-mc1152/src/main/java/com/viaversion/fabric/mc1152/providers/VFHandItemProvider.java @@ -45,9 +45,9 @@ public class VFHandItemProvider extends HandItemProvider { private Item getClientItem() { if (clientItem == null) { - return new DataItem(0, (byte) 0, (short) 0, null); + return new DataItem(0, (byte) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT) diff --git a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFHandItemProvider.java b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFHandItemProvider.java index cee02e7..a1e9ce5 100644 --- a/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFHandItemProvider.java +++ b/viafabric-mc1165/src/main/java/com/viaversion/fabric/mc1165/providers/VFHandItemProvider.java @@ -45,9 +45,9 @@ public class VFHandItemProvider extends HandItemProvider { private Item getClientItem() { if (clientItem == null) { - return new DataItem(0, (byte) 0, (short) 0, null); + return new DataItem(0, (byte) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT) diff --git a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/VFHandItemProvider.java b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/VFHandItemProvider.java index 5ee1ace..19cf285 100644 --- a/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/VFHandItemProvider.java +++ b/viafabric-mc1171/src/main/java/com/viaversion/fabric/mc1171/providers/VFHandItemProvider.java @@ -45,9 +45,9 @@ public class VFHandItemProvider extends HandItemProvider { private Item getClientItem() { if (clientItem == null) { - return new DataItem(0, (byte) 0, (short) 0, null); + return new DataItem(0, (byte) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT) diff --git a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFHandItemProvider.java b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFHandItemProvider.java index a7d2093..313d306 100644 --- a/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFHandItemProvider.java +++ b/viafabric-mc1182/src/main/java/com/viaversion/fabric/mc1182/providers/VFHandItemProvider.java @@ -45,9 +45,9 @@ public class VFHandItemProvider extends HandItemProvider { private Item getClientItem() { if (clientItem == null) { - return new DataItem(0, (byte) 0, (short) 0, null); + return new DataItem(0, (byte) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT) diff --git a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/VFHandItemProvider.java b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/VFHandItemProvider.java index 9be619d..1b26853 100644 --- a/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/VFHandItemProvider.java +++ b/viafabric-mc1194/src/main/java/com/viaversion/fabric/mc1194/providers/VFHandItemProvider.java @@ -45,9 +45,9 @@ public class VFHandItemProvider extends HandItemProvider { private Item getClientItem() { if (clientItem == null) { - return new DataItem(0, (byte) 0, (short) 0, null); + return new DataItem(0, (byte) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT) diff --git a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/providers/VFHandItemProvider.java b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/providers/VFHandItemProvider.java index d03a63e..d0dd41a 100644 --- a/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/providers/VFHandItemProvider.java +++ b/viafabric-mc1201/src/main/java/com/viaversion/fabric/mc1201/providers/VFHandItemProvider.java @@ -45,9 +45,9 @@ public class VFHandItemProvider extends HandItemProvider { private Item getClientItem() { if (clientItem == null) { - return new DataItem(0, (byte) 0, (short) 0, null); + return new DataItem(0, (byte) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT) diff --git a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/VFHandItemProvider.java b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/VFHandItemProvider.java index 0309881..2fc8551 100644 --- a/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/VFHandItemProvider.java +++ b/viafabric-mc1204/src/main/java/com/viaversion/fabric/mc1204/providers/VFHandItemProvider.java @@ -45,9 +45,9 @@ public class VFHandItemProvider extends HandItemProvider { private Item getClientItem() { if (clientItem == null) { - return new DataItem(0, (byte) 0, (short) 0, null); + return new DataItem(0, (byte) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT) diff --git a/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/VFHandItemProvider.java b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/VFHandItemProvider.java index 4219113..54056b1 100644 --- a/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/VFHandItemProvider.java +++ b/viafabric-mc1206/src/main/java/com/viaversion/fabric/mc1206/providers/VFHandItemProvider.java @@ -45,9 +45,9 @@ public class VFHandItemProvider extends HandItemProvider { private Item getClientItem() { if (clientItem == null) { - return new DataItem(0, (byte) 0, (short) 0, null); + return new DataItem(0, (byte) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT) diff --git a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/providers/VFHandItemProvider.java b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/providers/VFHandItemProvider.java index df426cf..065ad57 100644 --- a/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/providers/VFHandItemProvider.java +++ b/viafabric-mc189/src/main/java/com/viaversion/fabric/mc189/providers/VFHandItemProvider.java @@ -45,7 +45,7 @@ public class VFHandItemProvider extends HandItemProvider { if (info.isClientSide()) { return getClientItem(); } else if ((serverItem = serverPlayers.get(info.getProtocolInfo().getUuid())) != null) { - return new DataItem(serverItem); + return serverItem.copy(); } return super.getHandItem(info); } @@ -54,7 +54,7 @@ public class VFHandItemProvider extends HandItemProvider { if (clientItem == null) { return new DataItem(0, (byte) 0, (short) 0, null); } - return new DataItem(clientItem); + return clientItem.copy(); } @Environment(EnvType.CLIENT)