Added support for 1.16

api/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>npclib</artifactId>
         <groupId>net.jitse</groupId>
-        <version>2.7.2-SNAPSHOT</version>
+        <version>2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-api</artifactId>

nms/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.jitse</groupId>
         <artifactId>npclib</artifactId>
-        <version>2.7.2-SNAPSHOT</version>
+        <version>2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-nms</artifactId>
@@ -25,6 +25,7 @@
         <module>v1_13_R2</module>
         <module>v1_14_R1</module>
         <module>v1_15_R1</module>
+        <module>v1_16_R1</module>
     </modules>
 
     <dependencies>

nms/v1_10_R1/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.jitse</groupId>
         <artifactId>npclib-nms</artifactId>
-        <version>2.7.2-SNAPSHOT</version>
+        <version>2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-nms-v1_10_R1</artifactId>

nms/v1_11_R1/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.jitse</groupId>
         <artifactId>npclib-nms</artifactId>
-        <version>2.7.2-SNAPSHOT</version>
+        <version>2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-nms-v1_11_R1</artifactId>

nms/v1_12_R1/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.jitse</groupId>
         <artifactId>npclib-nms</artifactId>
-        <version>2.7.2-SNAPSHOT</version>
+        <version>2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-nms-v1_12_R1</artifactId>

nms/v1_13_R1/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.jitse</groupId>
         <artifactId>npclib-nms</artifactId>
-        <version>2.7.2-SNAPSHOT</version>
+        <version>2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-nms-v1_13_R1</artifactId>

nms/v1_13_R2/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.jitse</groupId>
         <artifactId>npclib-nms</artifactId>
-        <version>2.7.2-SNAPSHOT</version>
+        <version>2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-nms-v1_13_R2</artifactId>

nms/v1_14_R1/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.jitse</groupId>
         <artifactId>npclib-nms</artifactId>
-        <version>2.7.2-SNAPSHOT</version>
+        <version>2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-nms-v1_14_R1</artifactId>

nms/v1_15_R1/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>net.jitse</groupId>
         <artifactId>npclib-nms</artifactId>
-        <version>2.7.2-SNAPSHOT</version>
+        <version>2.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>npclib-nms-v1_15_R1</artifactId>

nms/v1_16_R1/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<project
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>net.jitse</groupId>
+        <artifactId>npclib-nms</artifactId>
+        <version>2.8-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>npclib-nms-v1_16_R1</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+            <version>1.16.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>

nms/v1_16_R1/src/main/java/net/jitse/npclib/nms/v1_16_R1/NPC_v1_16_R1.java

@@ -0,0 +1,126 @@
+package net.jitse.npclib.nms.v1_16_R1;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.datafixers.util.Pair;
+import net.jitse.npclib.NPCLib;
+import net.jitse.npclib.api.skin.Skin;
+import net.jitse.npclib.api.state.NPCSlot;
+import net.jitse.npclib.hologram.Hologram;
+import net.jitse.npclib.internal.MinecraftVersion;
+import net.jitse.npclib.internal.NPCBase;
+import net.jitse.npclib.nms.v1_16_R1.packets.*;
+import net.minecraft.server.v1_16_R1.*;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_16_R1.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Jitse Boonstra
+ */
+public class NPC_v1_16_R1 extends NPCBase {
+
+    private PacketPlayOutNamedEntitySpawn packetPlayOutNamedEntitySpawn;
+    private PacketPlayOutScoreboardTeam packetPlayOutScoreboardTeamRegister;
+    private PacketPlayOutPlayerInfo packetPlayOutPlayerInfoAdd, packetPlayOutPlayerInfoRemove;
+    private PacketPlayOutEntityHeadRotation packetPlayOutEntityHeadRotation;
+    private PacketPlayOutEntityDestroy packetPlayOutEntityDestroy;
+
+    public NPC_v1_16_R1(NPCLib instance, List<String> lines) {
+        super(instance, lines);
+    }
+
+    @Override
+    public void createPackets() {
+        this.hologram = new Hologram(MinecraftVersion.V1_15_R1, location.clone().add(0, 0.5, 0), text);
+
+        PacketPlayOutPlayerInfoWrapper packetPlayOutPlayerInfoWrapper = new PacketPlayOutPlayerInfoWrapper();
+
+        // Packets for spawning the NPC:
+        this.packetPlayOutScoreboardTeamRegister = new PacketPlayOutScoreboardTeamWrapper()
+                .createRegisterTeam(name); // First packet to send.
+
+        this.packetPlayOutPlayerInfoAdd = packetPlayOutPlayerInfoWrapper
+                .create(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, gameProfile, name); // Second packet to send.
+
+        this.packetPlayOutNamedEntitySpawn = new PacketPlayOutNamedEntitySpawnWrapper()
+                .create(uuid, location, entityId); // Third packet to send.
+
+        this.packetPlayOutEntityHeadRotation = new PacketPlayOutEntityHeadRotationWrapper()
+                .create(location, entityId); // Fourth packet to send.
+
+        this.packetPlayOutPlayerInfoRemove = packetPlayOutPlayerInfoWrapper
+                .create(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.REMOVE_PLAYER, gameProfile, name); // Fifth packet to send (delayed).
+
+        // Packet for destroying the NPC:
+        this.packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(entityId); // First packet to send.
+    }
+
+    @Override
+    public void sendShowPackets(Player player) {
+        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
+
+        if (hasTeamRegistered.add(player.getUniqueId()))
+            playerConnection.sendPacket(packetPlayOutScoreboardTeamRegister);
+        playerConnection.sendPacket(packetPlayOutPlayerInfoAdd);
+        playerConnection.sendPacket(packetPlayOutNamedEntitySpawn);
+        playerConnection.sendPacket(packetPlayOutEntityHeadRotation);
+        sendMetadataPacket(player);
+
+        hologram.show(player);
+
+        // Removing the player info after 10 seconds.
+        Bukkit.getScheduler().runTaskLater(instance.getPlugin(), () ->
+                playerConnection.sendPacket(packetPlayOutPlayerInfoRemove), 200);
+    }
+
+    @Override
+    public void sendHidePackets(Player player) {
+        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
+
+        playerConnection.sendPacket(packetPlayOutEntityDestroy);
+        playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
+
+        hologram.hide(player);
+    }
+
+    @Override
+    public void sendMetadataPacket(Player player) {
+        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
+        PacketPlayOutEntityMetadata packet = new PacketPlayOutEntityMetadataWrapper().create(activeStates, entityId);
+
+        playerConnection.sendPacket(packet);
+    }
+
+    @Override
+    public void sendEquipmentPacket(Player player, NPCSlot slot, boolean auto) {
+        PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
+
+        EnumItemSlot nmsSlot = slot.getNmsEnum(EnumItemSlot.class);
+        ItemStack item = getItem(slot);
+
+        Pair<EnumItemSlot, net.minecraft.server.v1_16_R1.ItemStack> pair = new Pair<>(nmsSlot, CraftItemStack.asNMSCopy(item));
+        PacketPlayOutEntityEquipment packet = new PacketPlayOutEntityEquipment(entityId, Collections.singletonList(pair));
+        playerConnection.sendPacket(packet);
+    }
+
+    @Override
+    public void updateSkin(Skin skin) {
+        GameProfile newProfile = new GameProfile(uuid, name);
+        newProfile.getProperties().get("textures").clear();
+        newProfile.getProperties().put("textures", new Property("textures", skin.getValue(), skin.getSignature()));
+        this.packetPlayOutPlayerInfoAdd = new PacketPlayOutPlayerInfoWrapper().create(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, newProfile, name);
+        for (Player player : Bukkit.getOnlinePlayers()) {
+            PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
+            playerConnection.sendPacket(packetPlayOutPlayerInfoRemove);
+            playerConnection.sendPacket(packetPlayOutEntityDestroy);
+            playerConnection.sendPacket(packetPlayOutPlayerInfoAdd);
+            playerConnection.sendPacket(packetPlayOutNamedEntitySpawn);
+        }
+    }
+}

nms/v1_16_R1/src/main/java/net/jitse/npclib/nms/v1_16_R1/packets/PacketPlayOutEntityHeadRotationWrapper.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2018 Jitse Boonstra
+ */
+
+package net.jitse.npclib.nms.v1_16_R1.packets;
+
+import com.comphenix.tinyprotocol.Reflection;
+import net.minecraft.server.v1_16_R1.PacketPlayOutEntityHeadRotation;
+import org.bukkit.Location;
+
+/**
+ * @author Jitse Boonstra
+ */
+public class PacketPlayOutEntityHeadRotationWrapper {
+
+    public PacketPlayOutEntityHeadRotation create(Location location, int entityId) {
+        PacketPlayOutEntityHeadRotation packetPlayOutEntityHeadRotation = new PacketPlayOutEntityHeadRotation();
+
+        Reflection.getField(packetPlayOutEntityHeadRotation.getClass(), "a", int.class).
+                set(packetPlayOutEntityHeadRotation, entityId);
+        Reflection.getField(packetPlayOutEntityHeadRotation.getClass(), "b", byte.class)
+                .set(packetPlayOutEntityHeadRotation, (byte) ((int) location.getYaw() * 256.0F / 360.0F));
+
+        return packetPlayOutEntityHeadRotation;
+    }
+}

nms/v1_16_R1/src/main/java/net/jitse/npclib/nms/v1_16_R1/packets/PacketPlayOutEntityMetadataWrapper.java

@@ -0,0 +1,39 @@
+package net.jitse.npclib.nms.v1_16_R1.packets;
+
+import net.jitse.npclib.api.state.NPCState;
+import net.minecraft.server.v1_16_R1.DataWatcher;
+import net.minecraft.server.v1_16_R1.DataWatcherObject;
+import net.minecraft.server.v1_16_R1.DataWatcherRegistry;
+import net.minecraft.server.v1_16_R1.PacketPlayOutEntityMetadata;
+
+import java.util.Collection;
+
+public class PacketPlayOutEntityMetadataWrapper {
+
+    public PacketPlayOutEntityMetadata create(Collection<NPCState> activateStates, int entityId) {
+        DataWatcher dataWatcher = new DataWatcher(null);
+        dataWatcher.register(new DataWatcherObject<>(16, DataWatcherRegistry.a), (byte) 127);
+
+        byte masked = NPCState.getMasked(activateStates);
+        // TODO: Find out why NPCState#CROUCHED doesn't work.
+        dataWatcher.register(new DataWatcherObject<>(0, DataWatcherRegistry.a), masked);
+
+//        for (Player online : Bukkit.getOnlinePlayers()) {
+//            DataWatcher watcher = ((CraftPlayer) online).getHandle().getDataWatcher();
+//            try {
+//                Field entriesField = watcher.getClass().getDeclaredField("entries");
+//                entriesField.setAccessible(true);
+//
+//                Int2ObjectOpenHashMap<DataWatcher.Item<?>> entries = (Int2ObjectOpenHashMap<DataWatcher.Item<?>>) entriesField.get(watcher);
+//                entries.forEach((integer, item) -> {
+//                    if (item.b() instanceof Boolean || item.b() instanceof Byte)
+//                        online.sendMessage(integer + ": " + item.b() + " type = " + item.b().getClass().toString());
+//                });
+//            } catch (NoSuchFieldException | IllegalAccessException e) {
+//                e.printStackTrace();
+//            }
+//        }
+
+        return new PacketPlayOutEntityMetadata(entityId, dataWatcher, true);
+    }
+}

nms/v1_16_R1/src/main/java/net/jitse/npclib/nms/v1_16_R1/packets/PacketPlayOutNamedEntitySpawnWrapper.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018 Jitse Boonstra
+ */
+
+package net.jitse.npclib.nms.v1_16_R1.packets;
+
+import com.comphenix.tinyprotocol.Reflection;
+import net.minecraft.server.v1_16_R1.PacketPlayOutNamedEntitySpawn;
+import org.bukkit.Location;
+
+import java.util.UUID;
+
+/**
+ * @author Jitse Boonstra
+ */
+public class PacketPlayOutNamedEntitySpawnWrapper {
+
+    public PacketPlayOutNamedEntitySpawn create(UUID uuid, Location location, int entityId) {
+        PacketPlayOutNamedEntitySpawn packetPlayOutNamedEntitySpawn = new PacketPlayOutNamedEntitySpawn();
+
+        Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "a", int.class)
+                .set(packetPlayOutNamedEntitySpawn, entityId);
+        Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "b", UUID.class)
+                .set(packetPlayOutNamedEntitySpawn, uuid);
+        Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "c", double.class)
+                .set(packetPlayOutNamedEntitySpawn, location.getX());
+        Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "d", double.class)
+                .set(packetPlayOutNamedEntitySpawn, location.getY());
+        Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "e", double.class)
+                .set(packetPlayOutNamedEntitySpawn, location.getZ());
+        Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "f", byte.class)
+                .set(packetPlayOutNamedEntitySpawn, (byte) ((int) (location.getYaw() * 256.0F / 360.0F)));
+        Reflection.getField(packetPlayOutNamedEntitySpawn.getClass(), "g", byte.class)
+                .set(packetPlayOutNamedEntitySpawn, (byte) ((int) (location.getPitch() * 256.0F / 360.0F)));
+
+        return packetPlayOutNamedEntitySpawn;
+    }
+}

nms/v1_16_R1/src/main/java/net/jitse/npclib/nms/v1_16_R1/packets/PacketPlayOutPlayerInfoWrapper.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018 Jitse Boonstra
+ */
+
+package net.jitse.npclib.nms.v1_16_R1.packets;
+
+import com.comphenix.tinyprotocol.Reflection;
+import com.mojang.authlib.GameProfile;
+import net.minecraft.server.v1_16_R1.EnumGamemode;
+import net.minecraft.server.v1_16_R1.IChatBaseComponent;
+import net.minecraft.server.v1_16_R1.PacketPlayOutPlayerInfo;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Jitse Boonstra
+ */
+public class PacketPlayOutPlayerInfoWrapper {
+
+    private final Class<?> packetPlayOutPlayerInfoClazz = Reflection.getMinecraftClass("PacketPlayOutPlayerInfo");
+    private final Class<?> playerInfoDataClazz = Reflection.getMinecraftClass("PacketPlayOutPlayerInfo$PlayerInfoData");
+    private final Reflection.ConstructorInvoker playerInfoDataConstructor = Reflection.getConstructor(playerInfoDataClazz,
+            packetPlayOutPlayerInfoClazz, GameProfile.class, int.class, EnumGamemode.class, IChatBaseComponent.class);
+
+    public PacketPlayOutPlayerInfo create(PacketPlayOutPlayerInfo.EnumPlayerInfoAction action, GameProfile gameProfile, String name) {
+        PacketPlayOutPlayerInfo packetPlayOutPlayerInfo = new PacketPlayOutPlayerInfo();
+        Reflection.getField(packetPlayOutPlayerInfo.getClass(), "a", PacketPlayOutPlayerInfo.EnumPlayerInfoAction.class)
+                .set(packetPlayOutPlayerInfo, action);
+
+        Object playerInfoData = playerInfoDataConstructor.invoke(packetPlayOutPlayerInfo, gameProfile, 1, EnumGamemode.NOT_SET,
+                IChatBaseComponent.ChatSerializer.b("{\"text\":\"[NPC] " + name + "\",\"color\":\"dark_gray\"}"));
+
+        Reflection.FieldAccessor<List> fieldAccessor = Reflection.getField(packetPlayOutPlayerInfo.getClass(), "b", List.class);
+        fieldAccessor.set(packetPlayOutPlayerInfo, Collections.singletonList(playerInfoData));
+
+        return packetPlayOutPlayerInfo;
+    }
+}