diff --git a/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java b/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java index 5a43ee4..88cbc39 100644 --- a/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java +++ b/v1_21_R5/src/main/java/me/lojosho/hibiscuscommons/nms/v1_21_R5/NMSPackets.java @@ -1,84 +1,156 @@ package me.lojosho.hibiscuscommons.nms.v1_21_R5; +import com.google.common.collect.ImmutableList; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.mojang.authlib.GameProfile; import com.mojang.datafixers.util.Pair; import com.mojang.serialization.JsonOps; -import io.netty.buffer.Unpooled; +import io.papermc.paper.adventure.PaperAdventure; import it.unimi.dsi.fastutil.ints.IntList; import me.lojosho.hibiscuscommons.HibiscusCommonsPlugin; +import me.lojosho.hibiscuscommons.util.AdventureUtils; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; -import net.minecraft.advancements.*; -import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.advancements.Advancement; +import net.minecraft.advancements.AdvancementHolder; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.*; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.PositionMoveRotation; +import net.minecraft.world.entity.decoration.ArmorStand; import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.level.portal.TeleportTransition; +import net.minecraft.world.level.GameType; import net.minecraft.world.phys.Vec3; import net.minecraft.world.scores.PlayerTeam; import net.minecraft.world.scores.Team; import org.bukkit.Bukkit; import org.bukkit.Color; +import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.craftbukkit.CraftEquipmentSlot; import org.bukkit.craftbukkit.entity.CraftEntityType; import org.bukkit.craftbukkit.entity.CraftPlayer; import org.bukkit.craftbukkit.inventory.CraftItemStack; import org.bukkit.craftbukkit.scoreboard.CraftScoreboard; -import org.bukkit.entity.Display; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.ItemDisplay; -import org.bukkit.entity.Player; -import org.bukkit.event.player.PlayerTeleportEvent; +import org.bukkit.entity.*; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.components.CustomModelDataComponent; +import org.jetbrains.annotations.NotNull; import org.joml.Quaternionf; import org.joml.Vector3f; -import java.lang.reflect.Constructor; import java.util.*; +import java.util.stream.Collectors; public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons.nms.NMSPackets { - static Constructor passengerConstructor; - static Constructor linkConstructor; - static Constructor cameraConstructor; - static Constructor lookAtConstructor; + private static ServerLevel level = MinecraftServer.getServer().overworld(); + private static Entity fakeNmsEntity = new ArmorStand(net.minecraft.world.entity.EntityType.ARMOR_STAND, level); - static { - try { - passengerConstructor = ClientboundSetPassengersPacket.class.getDeclaredConstructor(FriendlyByteBuf.class); - passengerConstructor.setAccessible(true); - } catch (Exception e) { - e.printStackTrace(); - } - try { - linkConstructor = ClientboundSetEntityLinkPacket.class.getDeclaredConstructor(FriendlyByteBuf.class); - linkConstructor.setAccessible(true); - } catch (Exception e) { - e.printStackTrace(); - } - try { - cameraConstructor = ClientboundSetCameraPacket.class.getDeclaredConstructor(FriendlyByteBuf.class); - cameraConstructor.setAccessible(true); - } catch (Exception e) { - e.printStackTrace(); - } - try { - lookAtConstructor = ClientboundPlayerLookAtPacket.class.getDeclaredConstructor(FriendlyByteBuf.class); - lookAtConstructor.setAccessible(true); - } catch (Exception e) { - e.printStackTrace(); - } + @Override @SuppressWarnings("unchecked") + public void sendSharedEntityData(int entityId, Map dataValues, List sendTo) { + List> nmsDataValues = dataValues.entrySet().stream().map(entry -> { + int index = entry.getKey(); + Number value = entry.getValue(); + return switch (value) { + case Byte byteVal -> new SynchedEntityData.DataValue<>(index, EntityDataSerializers.BYTE, byteVal); + case Float floatVal -> new SynchedEntityData.DataValue<>(index, EntityDataSerializers.FLOAT, floatVal); + case Integer intVal -> new SynchedEntityData.DataValue<>(index, EntityDataSerializers.INT, intVal); + default -> + throw new IllegalArgumentException("Unsupported data value type: " + value.getClass().getSimpleName()); + }; + }).collect(Collectors.toList()); + + ClientboundSetEntityDataPacket packet = new ClientboundSetEntityDataPacket(entityId, nmsDataValues); + for (Player player : sendTo) sendPacket(player, packet); + } + + @Override + public void sendFakePlayerInfoPacket( + final Player skinnedPlayer, + final int entityId, + final UUID uuid, + final String npcName, + final List sendTo + ) { + ServerPlayer player = ((CraftPlayer) skinnedPlayer).getHandle(); + String name = npcName.substring(0, 15); + GameProfile profile = new GameProfile(uuid, name); + + Component component = AdventureUtils.MINI_MESSAGE.deserialize(name); + net.minecraft.network.chat.Component nmsComponent = HibiscusCommonsPlugin.isOnPaper() ? PaperAdventure.asVanilla(component) : net.minecraft.network.chat.Component.literal(name); + + ClientboundPlayerInfoUpdatePacket.Entry entry = new ClientboundPlayerInfoUpdatePacket.Entry(uuid, profile, false, 0, GameType.CREATIVE, nmsComponent, true, player.listOrder, player.getChatSession().asData()); + EnumSet actions = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER); + ClientboundPlayerInfoUpdatePacket packet = new ClientboundPlayerInfoUpdatePacket(actions, entry); + for (Player p : sendTo) sendPacket(p, packet); + } + + @Override + public void sendPlayerInfoRemovePacket(final UUID uuid, final List sendTo) { + ClientboundPlayerInfoRemovePacket packet = new ClientboundPlayerInfoRemovePacket(List.of(uuid)); + for (Player player : sendTo) sendPacket(player, packet); + } + + @Override + public void sendMovePacket( + final int entityId, + final @NotNull Location from, + final @NotNull Location to, + final boolean onGround, + @NotNull List sendTo + ) { + byte dx = (byte) (to.getX() - from.getX()); + byte dy = (byte) (to.getY() - from.getY()); + byte dz = (byte) (to.getZ() - from.getZ()); + + ClientboundMoveEntityPacket.Pos packet = new ClientboundMoveEntityPacket.Pos(entityId, dx, dy, dz, onGround); + for (Player p : sendTo) sendPacket(p, packet); + } + + @Override + public void sendGamemodeChange(Player player, GameMode gameMode) { + ClientboundGameEventPacket.Type type = ClientboundGameEventPacket.CHANGE_GAME_MODE; + float param = gameMode.ordinal(); + + ClientboundGameEventPacket packet = new ClientboundGameEventPacket(type, param); + sendPacket(player, packet); + } + + @Override + public void sendRotateHeadPacket(int entityId, Location location, List sendTo) { + fakeNmsEntity.setId(entityId); + byte headRot = (byte) (location.getYaw() * 256.0F / 360.0F); + + ClientboundRotateHeadPacket packet = new ClientboundRotateHeadPacket(fakeNmsEntity, headRot); + for (Player p : sendTo) sendPacket(p, packet); + } + + @Override + public void sendRotationPacket(int entityId, float yaw, float pitch, boolean onGround, List sendTo) { + float ROTATION_FACTOR = 256.0F / 360.0F; + yaw = (byte) (yaw * ROTATION_FACTOR); + pitch = (byte) (pitch * ROTATION_FACTOR); + ClientboundMoveEntityPacket.Rot packet = new ClientboundMoveEntityPacket.Rot(entityId, (byte) yaw, (byte) pitch, onGround); + for (Player p : sendTo) sendPacket(p, packet); + } + + @Override + public void sendRotationPacket(int entityId, Location location, boolean onGround, List sendTo) { + float ROTATION_FACTOR = 256.0F / 360.0F; + byte yaw = (byte) (location.getYaw() * ROTATION_FACTOR); + byte pitch = (byte) (location.getPitch() * ROTATION_FACTOR); + ClientboundMoveEntityPacket.Rot packet = new ClientboundMoveEntityPacket.Rot(entityId, yaw, pitch, onGround); + for (Player p : sendTo) sendPacket(p, packet); } @Override @@ -174,28 +246,28 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. @Override public void sendMountPacket(int mountId, int[] passengerIds, List sendTo) { - FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer()); - byteBuf.writeVarInt(mountId); - byteBuf.writeVarIntArray(passengerIds); - try { - ClientboundSetPassengersPacket packet = passengerConstructor.newInstance(byteBuf); - for (Player p : sendTo) sendPacket(p, packet); - } catch (Exception e) { - e.printStackTrace(); - } + List 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(); + for (Player p : sendTo) sendPacket(p, packet); } @Override public void sendLeashPacket(int leashEntity, int entityId, List sendTo) { - FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer()); - byteBuf.writeInt(leashEntity); - byteBuf.writeInt(entityId); - try { - ClientboundSetEntityLinkPacket packet = linkConstructor.newInstance(byteBuf); - for (Player p : sendTo) sendPacket(p, packet); - } catch (Exception e) { - e.printStackTrace(); - } + // Fake entities just to avoid reflection + ServerLevel level = MinecraftServer.getServer().overworld(); + Entity entity1 = new ArmorStand(net.minecraft.world.entity.EntityType.ARMOR_STAND, level); + Entity entity2 = new ArmorStand(net.minecraft.world.entity.EntityType.ARMOR_STAND, level); + entity1.setId(leashEntity); + entity2.setId(entityId); + + ClientboundSetEntityLinkPacket packet = new ClientboundSetEntityLinkPacket(entity1, entity2); + for (Player p : sendTo) sendPacket(p, packet); } @Override @@ -210,21 +282,7 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. List sendTo ) { try { - ClientboundTeleportEntityPacket packet = ClientboundTeleportEntityPacket.teleport(entityId, new PositionMoveRotation(new Vec3(x, y, z), Vec3.ZERO, yaw, pitch), java.util.Set.of(), onGround); - for (Player p : sendTo) sendPacket(p, packet); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Override - public void sendRotationPacket(int entityId, float yaw, boolean onGround, List sendTo) { - FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer()); - byteBuf.writeVarInt(entityId); - byteBuf.writeFloat(yaw); - byteBuf.writeBoolean(onGround); - try { - ClientboundPlayerLookAtPacket packet = lookAtConstructor.newInstance(byteBuf); + ClientboundTeleportEntityPacket packet = ClientboundTeleportEntityPacket.teleport(entityId, new PositionMoveRotation(new Vec3(x, y, z), Vec3.ZERO, yaw, pitch), Set.of(), onGround); for (Player p : sendTo) sendPacket(p, packet); } catch (Exception e) { e.printStackTrace(); @@ -233,14 +291,10 @@ public class NMSPackets extends NMSCommon implements me.lojosho.hibiscuscommons. @Override public void sendCameraPacket(int entityId, List sendTo) { - FriendlyByteBuf byteBuf = new FriendlyByteBuf(Unpooled.buffer()); - byteBuf.writeVarInt(entityId); - try { - ClientboundSetCameraPacket packet = cameraConstructor.newInstance(byteBuf); - for (Player p : sendTo) sendPacket(p, packet); - } catch (Exception e) { - e.printStackTrace(); - } + fakeNmsEntity.setId(entityId); + + ClientboundSetCameraPacket packet = new ClientboundSetCameraPacket(fakeNmsEntity); + for (Player p : sendTo) sendPacket(p, packet); } @@ -393,4 +447,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 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; + } }