From cc28221af759529c14536c313c825e8f388d5007 Mon Sep 17 00:00:00 2001
From: LoJoSho <LoJoShogaming@gmail.com>
Date: Sat, 21 Dec 2024 11:55:16 -0600
Subject: [PATCH] fix: not using VarInt in some new NMS packets

---
 .../me/lojosho/hibiscuscommons/nms/v1_20_R1/NMSPackets.java   | 4 ++--
 .../me/lojosho/hibiscuscommons/nms/v1_20_R2/NMSPackets.java   | 4 ++--
 .../me/lojosho/hibiscuscommons/nms/v1_20_R3/NMSPackets.java   | 4 ++--
 .../me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java   | 4 ++--
 .../me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java   | 4 ++--
 .../me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java   | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/v1_20_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R1/NMSPackets.java b/v1_20_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R1/NMSPackets.java
index 876b6f3..c4a6f2c 100644
--- a/v1_20_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R1/NMSPackets.java
+++ b/v1_20_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R1/NMSPackets.java
@@ -193,7 +193,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
             List<Player> sendTo
     ) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeDouble(x);
         byteBuf.writeDouble(y);
         byteBuf.writeDouble(z);
@@ -212,7 +212,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
     @Override
     public void sendRotationPacket(int entityId, float yaw, boolean onGround, List<Player> sendTo) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeFloat(yaw);
         byteBuf.writeBoolean(onGround);
         try {
diff --git a/v1_20_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R2/NMSPackets.java b/v1_20_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R2/NMSPackets.java
index 26b8ea5..2bade22 100644
--- a/v1_20_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R2/NMSPackets.java
+++ b/v1_20_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R2/NMSPackets.java
@@ -193,7 +193,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
             List<Player> sendTo
     ) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeDouble(x);
         byteBuf.writeDouble(y);
         byteBuf.writeDouble(z);
@@ -212,7 +212,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
     @Override
     public void sendRotationPacket(int entityId, float yaw, boolean onGround, List<Player> sendTo) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeFloat(yaw);
         byteBuf.writeBoolean(onGround);
         try {
diff --git a/v1_20_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R3/NMSPackets.java b/v1_20_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R3/NMSPackets.java
index 09c8fbe..56863a9 100644
--- a/v1_20_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R3/NMSPackets.java
+++ b/v1_20_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R3/NMSPackets.java
@@ -194,7 +194,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
             List<Player> sendTo
     ) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeDouble(x);
         byteBuf.writeDouble(y);
         byteBuf.writeDouble(z);
@@ -213,7 +213,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
     @Override
     public void sendRotationPacket(int entityId, float yaw, boolean onGround, List<Player> sendTo) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeFloat(yaw);
         byteBuf.writeBoolean(onGround);
         try {
diff --git a/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java b/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java
index 2c59b21..76b711a 100644
--- a/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java
+++ b/v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java
@@ -193,7 +193,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
             List<Player> sendTo
     ) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeDouble(x);
         byteBuf.writeDouble(y);
         byteBuf.writeDouble(z);
@@ -212,7 +212,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
     @Override
     public void sendRotationPacket(int entityId, float yaw, boolean onGround, List<Player> sendTo) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeFloat(yaw);
         byteBuf.writeBoolean(onGround);
         try {
diff --git a/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java b/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java
index bf6ff03..bc473fc 100644
--- a/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java
+++ b/v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java
@@ -203,7 +203,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
             List<Player> sendTo
     ) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeDouble(x);
         byteBuf.writeDouble(y);
         byteBuf.writeDouble(z);
@@ -222,7 +222,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
     @Override
     public void sendRotationPacket(int entityId, float yaw, boolean onGround, List<Player> sendTo) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeFloat(yaw);
         byteBuf.writeBoolean(onGround);
         try {
diff --git a/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java b/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java
index 18a151f..c86e3d7 100644
--- a/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java
+++ b/v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java
@@ -201,7 +201,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
     @Override
     public void sendRotationPacket(int entityId, float yaw, boolean onGround, List<Player> sendTo) {
         FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer());
-        byteBuf.writeInt(entityId);
+        byteBuf.writeVarInt(entityId);
         byteBuf.writeFloat(yaw);
         byteBuf.writeBoolean(onGround);
         try {