update

.idea/gradle.xml

@@ -12,6 +12,7 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/1.16" />
             <option value="$PROJECT_DIR$/1.17" />
             <option value="$PROJECT_DIR$/1.18" />
             <option value="$PROJECT_DIR$/common" />

.idea/modules/1.16/HMCCosmetics.1.16.main.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>SPIGOT</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
+</module>

.idea/modules/common/HMCCosmetics.common.main.iml

@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>SPIGOT</platformType>
-          <platformType>MCP</platformType>
-          <platformType>ADVENTURE</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
   <component name="McpModuleSettings">
     <option name="srgType" value="SRG" />
   </component>

1.16/build.gradle.kts

@@ -0,0 +1,19 @@
+plugins {
+    id("java")
+}
+
+repositories {
+    mavenCentral()
+    maven("https://papermc.io/repo/repository/maven-public/")
+    maven("https://oss.sonatype.org/content/repositories/snapshots")
+    maven("https://jitpack.io")
+    maven("https://repo.dmulloy2.net/repository/public/")
+}
+
+dependencies {
+    implementation(project(":nms"))
+    compileOnly("com.mojang:authlib:1.5.25")
+    compileOnly("org.spigotmc:spigot:1.16.5-R0.1-SNAPSHOT")
+    compileOnly("org.jetbrains:annotations:22.0.0")
+    compileOnly("com.comphenix.protocol:ProtocolLib:4.7.0")
+}

1.16/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

1.16/src/main/java/io/github/fisher2911/nms/ArmorStandPackets_1_16_R3.java

@@ -0,0 +1,24 @@
+package io.github.fisher2911.nms;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.wrappers.WrappedDataWatcher;
+
+public class ArmorStandPackets_1_16_R3 implements ArmorStandPackets {
+
+    @Override
+    public PacketContainer getArmorStandMeta(final int armorStandId) {
+        final PacketContainer metaContainer = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
+
+        WrappedDataWatcher metaData = new WrappedDataWatcher();
+
+        final WrappedDataWatcher.Serializer byteSerializer = WrappedDataWatcher.Registry.get(Byte.class);
+
+        metaData.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(0, byteSerializer), (byte) (0x20));
+        metaData.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(14, byteSerializer), (byte) (0x10));
+
+        metaContainer.getIntegers().write(0, armorStandId);
+        metaContainer.getWatchableCollectionModifier().write(0, metaData.getWatchableObjects());
+        return metaContainer;
+    }
+}

1.16/src/main/java/io/github/fisher2911/nms/DestroyPacket_1_16_R3.java

@@ -0,0 +1,16 @@
+package io.github.fisher2911.nms;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.PacketContainer;
+
+public class DestroyPacket_1_16_R3 implements DestroyPacket {
+
+    @Override
+    public PacketContainer get(final int entityId) {
+        final PacketContainer destroyPacket = new PacketContainer(
+                PacketType.Play.Server.ENTITY_DESTROY);
+        destroyPacket.getIntegerArrays().write(0, new int[]{entityId});
+
+        return destroyPacket;
+    }
+}

1.16/src/main/java/io/github/fisher2911/nms/PlayerPackets_1_16_R3.java

@@ -0,0 +1,96 @@
+package io.github.fisher2911.nms;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.reflect.StructureModifier;
+import com.comphenix.protocol.wrappers.EnumWrappers;
+import com.comphenix.protocol.wrappers.PlayerInfoData;
+import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import com.comphenix.protocol.wrappers.WrappedGameProfile;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import org.bukkit.GameMode;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_16_R3.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class PlayerPackets_1_16_R3 implements PlayerPackets {
+
+    @Override
+    public PacketContainer getSpawnPacket(final Location location, UUID uuid, final int entityId) {
+        final PacketContainer spawnPacket = new PacketContainer(PacketType.Play.Server.NAMED_ENTITY_SPAWN);
+        spawnPacket.getUUIDs().write(0, uuid);
+        spawnPacket.getIntegers().write(0, entityId);
+        spawnPacket.getDoubles().
+                write(0, location.getX()).
+                write(1, location.getY()).
+                write(2, location.getZ());
+        spawnPacket.getBytes().write(0, (byte)(((location.getYaw() * 256.0F) / 360.0F)));
+
+        return spawnPacket;
+    }
+
+    @Override
+    public PacketContainer getPlayerInfoPacket(final Player player, final UUID uuid) {
+        final GameProfile profile = this.getCopyProfile(player, uuid);
+        final PacketContainer playerInfoPacket = new PacketContainer(PacketType.Play.Server.PLAYER_INFO);
+        final StructureModifier<EnumWrappers.PlayerInfoAction> action = playerInfoPacket.getPlayerInfoAction();
+        final StructureModifier<List<PlayerInfoData>> infoData = playerInfoPacket.getPlayerInfoDataLists();
+
+        final List<PlayerInfoData> playerInfoData = new ArrayList<>();
+
+        playerInfoData.add(new PlayerInfoData(WrappedGameProfile
+                .fromHandle(profile),
+                0,
+                EnumWrappers.NativeGameMode.fromBukkit(GameMode.CREATIVE),
+                WrappedChatComponent.fromText(profile.getName())));
+
+        action.write(0, EnumWrappers.PlayerInfoAction.ADD_PLAYER);
+        infoData.write(0, playerInfoData);
+
+        return playerInfoPacket;
+    }
+
+    @Override
+    public PacketContainer getRemovePacket(final Player player, final UUID uuid, final int entityId) {
+        final PacketContainer playerPacket = new PacketContainer(PacketType.Play.Server.PLAYER_INFO);
+        final StructureModifier<EnumWrappers.PlayerInfoAction> action = playerPacket.getPlayerInfoAction();
+        final StructureModifier<List<PlayerInfoData>> infoData = playerPacket.getPlayerInfoDataLists();
+
+        final List<PlayerInfoData> playerInfoData = new ArrayList<>();
+
+        final GameProfile profile = this.getCopyProfile(player, uuid);
+
+        playerInfoData.add(new PlayerInfoData(WrappedGameProfile
+                .fromHandle(profile),
+                0,
+                EnumWrappers.NativeGameMode.fromBukkit(GameMode.CREATIVE),
+                WrappedChatComponent.fromText("")));
+
+        action.write(0, EnumWrappers.PlayerInfoAction.REMOVE_PLAYER);
+        infoData.write(0, playerInfoData);
+
+        return playerPacket;
+    }
+
+    private GameProfile getCopyProfile(final Player player, final UUID uuid) {
+        final GameProfile playerProfile = ((CraftPlayer) player).getProfile();
+        final GameProfile profile = new GameProfile(
+                uuid,
+                player.getDisplayName()
+        );
+
+        profile.getProperties().removeAll("textures");
+        Property textureProperty = playerProfile.getProperties().get("textures").iterator().next();
+        String texture = textureProperty.getValue();
+        String signature = textureProperty.getSignature();
+        profile.getProperties().put("textures", new Property("textures", texture, signature));
+
+        return profile;
+    }
+
+}

1.17/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

1.17/build/tmp/shadowJar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

1.17/src/main/java/io/github/fisher2911/nms/ArmorStandPackets_1_17_R1.java

@@ -0,0 +1,24 @@
+package io.github.fisher2911.nms;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.wrappers.WrappedDataWatcher;
+
+public class ArmorStandPackets_1_17_R1 implements ArmorStandPackets {
+
+    @Override
+    public PacketContainer getArmorStandMeta(final int armorStandId) {
+        final PacketContainer metaContainer = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
+
+        WrappedDataWatcher metaData = new WrappedDataWatcher();
+
+        final WrappedDataWatcher.Serializer byteSerializer = WrappedDataWatcher.Registry.get(Byte.class);
+
+        metaData.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(0, byteSerializer), (byte) (0x20));
+        metaData.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(15, byteSerializer), (byte) (0x10));
+
+        metaContainer.getIntegers().write(0, armorStandId);
+        metaContainer.getWatchableCollectionModifier().write(0, metaData.getWatchableObjects());
+        return metaContainer;
+    }
+}

1.18/build/tmp/jar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

1.18/build/tmp/shadowJar/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+

1.18/src/main/java/io/github/fisher2911/nms/ArmorStandPackets_1_18_R1.java

@@ -0,0 +1,24 @@
+package io.github.fisher2911.nms;
+
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.wrappers.WrappedDataWatcher;
+
+public class ArmorStandPackets_1_18_R1 implements ArmorStandPackets {
+
+    @Override
+    public PacketContainer getArmorStandMeta(final int armorStandId) {
+        final PacketContainer metaContainer = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
+
+        WrappedDataWatcher metaData = new WrappedDataWatcher();
+
+        final WrappedDataWatcher.Serializer byteSerializer = WrappedDataWatcher.Registry.get(Byte.class);
+
+        metaData.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(0, byteSerializer), (byte) (0x20));
+        metaData.setObject(new WrappedDataWatcher.WrappedDataWatcherObject(15, byteSerializer), (byte) (0x10));
+
+        metaContainer.getIntegers().write(0, armorStandId);
+        metaContainer.getWatchableCollectionModifier().write(0, metaData.getWatchableObjects());
+        return metaContainer;
+    }
+}

common/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Feb 02 16:44:24 EST 2022
+gradle.version=7.3.3

common/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "io.github.fisher2911"
-version = "1.7.1"
+version = "1.8.1"
 description = "Intuitive, easy-to-use cosmetics plugin, designed for servers using resource packs.\n"
 
 repositories {
@@ -23,18 +23,19 @@ repositories {
 }
 
 dependencies {
+    implementation(project(":1.16"))
     implementation(project(":1.17"))
     implementation(project(":1.18"))
     implementation(project(":nms"))
     compileOnly("com.mojang:authlib:1.5.25")
-    compileOnly("org.spigotmc:spigot:1.17-R0.1-SNAPSHOT")
+    compileOnly("org.spigotmc:spigot:1.16.5-R0.1-SNAPSHOT")
     compileOnly("org.jetbrains:annotations:22.0.0")
     compileOnly("com.comphenix.protocol:ProtocolLib:4.7.0")
     compileOnly("me.clip:placeholderapi:2.11.1")
     compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
     compileOnly("com.github.LoneDev6:API-ItemsAdder:2.5.4")
     implementation("net.kyori:adventure-api:4.9.3")
-    implementation("net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT")
+    implementation ("net.kyori:adventure-text-minimessage:4.10.0-SNAPSHOT")
     implementation("net.kyori:adventure-platform-bukkit:4.0.1")
     implementation("dev.triumphteam:triumph-gui:3.1.1")
     implementation("me.mattstudios.utils:matt-framework:1.4.6")
@@ -58,8 +59,7 @@ tasks {
     shadowJar {
         relocate("dev.triumphteam.gui", "io.github.fisher2911.hmccosmetics.gui")
         relocate("me.mattstudios.mf", "io.github.fisher2911.hmccosmetics.mf")
-        relocate("net.kyori.adventure.text.minimessage", "io.github.fisher2911.hmccosmetics.adventure.minimessage")
-        relocate("net.kyori.adventure.platform", "io.github.fisher2911.hmccosmetics.adventure.platform")
+        relocate("net.kyori.adventure", "io.github.fisher2911.hmccosmetics.adventure")
         relocate("org.spongepowered.configurate", "io.github.fisher2911.hmccosmetics.configurate")
         relocate("org.bstats", "io.github.fisher2911.hmccosmetics.bstats")
         relocate("com.zaxxer.hikaricp", "io.github.fisher2911.hmccosmetics.hikaricp")
@@ -84,7 +84,7 @@ java {
 bukkit {
     load = BukkitPluginDescription.PluginLoadOrder.STARTUP
     main = "io.github.fisher2911.hmccosmetics.HMCCosmetics"
-    apiVersion = "1.17"
+    apiVersion = "1.16"
     name = "HMCCosmetics"
     authors = listOf("MasterOfTheFish")
     softDepend = listOf("Multiverse", "PlaceholderAPI", "Oraxen", "ItemsAdder")