feat: expose helper method to create mount-packets

common/src/main/java/me/lojosho/hibiscuscommons/nms/NMSPackets.java

@@ -93,4 +93,6 @@ public interface NMSPackets {
                                  List<Player> sendTo);
 
     void sendToastPacket(Player player, ItemStack icon, Component title, Component description);
+
+    Object createMountPacket(int entityId, int[] passengerIds);
 }

gradle.properties

@@ -1 +1 @@
-userdevVersion=2.0.0-beta.14
+userdevVersion=2.0.0-beta.17

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

v1_20_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R3/NMSPackets.java

@@ -346,4 +346,18 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
     public void sendToastPacket(Player player, ItemStack icon, Component title, Component description) {
         throw new UnsupportedOperationException("Not implemented in this version.");
     }
+
+    @Override
+    public Object createMountPacket(int entityId, int[] passengerIds) {
+        fakeNmsEntity.setId(entityId);
+        List<Entity> passengers = Arrays.stream(passengerIds).mapToObj(id -> {
+            Entity passenger = new ArmorStand(net.minecraft.world.entity.EntityType.ARMOR_STAND, level);
+            passenger.setId(id);
+            return passenger;
+        }).toList();
+        fakeNmsEntity.passengers = ImmutableList.copyOf(passengers);
+        ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity);
+        fakeNmsEntity.passengers = ImmutableList.of();
+        return packet;
+    }
 }

v1_20_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_20_R4/NMSPackets.java

@@ -415,4 +415,18 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
             sendPacket(player, removePacket);
         }, 2L);
     }
+
+    @Override
+    public Object createMountPacket(int entityId, int[] passengerIds) {
+        fakeNmsEntity.setId(entityId);
+        List<Entity> passengers = Arrays.stream(passengerIds).mapToObj(id -> {
+            Entity passenger = new ArmorStand(net.minecraft.world.entity.EntityType.ARMOR_STAND, level);
+            passenger.setId(id);
+            return passenger;
+        }).toList();
+        fakeNmsEntity.passengers = ImmutableList.copyOf(passengers);
+        ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity);
+        fakeNmsEntity.passengers = ImmutableList.of();
+        return packet;
+    }
 }

v1_21_R1/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R1/NMSPackets.java

@@ -414,4 +414,18 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
             sendPacket(player, removePacket);
         }, 2L);
     }
+
+    @Override
+    public Object createMountPacket(int entityId, int[] passengerIds) {
+        fakeNmsEntity.setId(entityId);
+        List<Entity> passengers = Arrays.stream(passengerIds).mapToObj(id -> {
+            Entity passenger = new ArmorStand(net.minecraft.world.entity.EntityType.ARMOR_STAND, level);
+            passenger.setId(id);
+            return passenger;
+        }).toList();
+        fakeNmsEntity.passengers = ImmutableList.copyOf(passengers);
+        ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity);
+        fakeNmsEntity.passengers = ImmutableList.of();
+        return packet;
+    }
 }

v1_21_R2/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R2/NMSPackets.java

@@ -417,4 +417,18 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
             sendPacket(player, removePacket);
         }, 2L);
     }
+
+    @Override
+    public Object createMountPacket(int entityId, int[] passengerIds) {
+        fakeNmsEntity.setId(entityId);
+        List<Entity> passengers = Arrays.stream(passengerIds).mapToObj(id -> {
+            Entity passenger = new ArmorStand(net.minecraft.world.entity.EntityType.ARMOR_STAND, level);
+            passenger.setId(id);
+            return passenger;
+        }).toList();
+        fakeNmsEntity.passengers = ImmutableList.copyOf(passengers);
+        ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity);
+        fakeNmsEntity.passengers = ImmutableList.of();
+        return packet;
+    }
 }

v1_21_R3/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R3/NMSPackets.java

@@ -454,4 +454,18 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
             sendPacket(player, removePacket);
         }, 2L);
     }
+
+    @Override
+    public Object createMountPacket(int entityId, int[] passengerIds) {
+        fakeNmsEntity.setId(entityId);
+        List<Entity> passengers = Arrays.stream(passengerIds).mapToObj(id -> {
+            Entity passenger = new ArmorStand(net.minecraft.world.entity.EntityType.ARMOR_STAND, level);
+            passenger.setId(id);
+            return passenger;
+        }).toList();
+        fakeNmsEntity.passengers = ImmutableList.copyOf(passengers);
+        ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity);
+        fakeNmsEntity.passengers = ImmutableList.of();
+        return packet;
+    }
 }

v1_21_R4/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R4/NMSPackets.java

@@ -453,4 +453,18 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.
             sendPacket(player, removePacket);
         }, 2L);
     }
+
+    @Override
+    public Object createMountPacket(int entityId, int[] passengerIds) {
+        fakeNmsEntity.setId(entityId);
+        List<Entity> passengers = Arrays.stream(passengerIds).mapToObj(id -> {
+            Entity passenger = new ArmorStand(net.minecraft.world.entity.EntityType.ARMOR_STAND, level);
+            passenger.setId(id);
+            return passenger;
+        }).toList();
+        fakeNmsEntity.passengers = ImmutableList.copyOf(passengers);
+        ClientboundSetPassengersPacket packet = new ClientboundSetPassengersPacket(fakeNmsEntity);
+        fakeNmsEntity.passengers = ImmutableList.of();
+        return packet;
+    }
 }