diff --git a/.gitignore b/.gitignore index 339d17e9..4d4afea2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ # Project exclude paths /.gradle/ +/gradle/ +/.idea/ /build/ /build/classes/java/main/ /common/build/ diff --git a/.idea/misc.xml b/.idea/misc.xml index 353604cf..fbe84d1d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/1.16/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_16_R3.class b/1.16/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_16_R3.class index 46eb73db..519b94b1 100644 Binary files a/1.16/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_16_R3.class and b/1.16/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_16_R3.class differ diff --git a/1.16/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_16_R3.class b/1.16/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_16_R3.class index 0b12a429..9c850eb1 100644 Binary files a/1.16/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_16_R3.class and b/1.16/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_16_R3.class differ diff --git a/1.16/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets_1_16_R3.class b/1.16/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets_1_16_R3.class deleted file mode 100644 index 8240af3c..00000000 Binary files a/1.16/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets_1_16_R3.class and /dev/null differ diff --git a/1.16/build/libs/1.16.jar b/1.16/build/libs/1.16.jar index 23ab0d98..d3a070dd 100644 Binary files a/1.16/build/libs/1.16.jar and b/1.16/build/libs/1.16.jar differ diff --git a/1.16/build/tmp/compileJava/previous-compilation-data.bin b/1.16/build/tmp/compileJava/previous-compilation-data.bin index 17fb457d..67879446 100644 Binary files a/1.16/build/tmp/compileJava/previous-compilation-data.bin and b/1.16/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/1.16/src/main/java/io/github/fisher2911/nms/ArmorStandPackets_1_16_R3.java b/1.16/src/main/java/io/github/fisher2911/nms/ArmorStandPackets_1_16_R3.java index 386aa46e..e931a365 100644 --- a/1.16/src/main/java/io/github/fisher2911/nms/ArmorStandPackets_1_16_R3.java +++ b/1.16/src/main/java/io/github/fisher2911/nms/ArmorStandPackets_1_16_R3.java @@ -4,21 +4,6 @@ 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 { +public class ArmorStandPackets_1_16_R3 { - @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; - } } diff --git a/1.17/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_17_R1.class b/1.17/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_17_R1.class deleted file mode 100644 index 073497b3..00000000 Binary files a/1.17/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_17_R1.class and /dev/null differ diff --git a/1.17/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_17_R1.class b/1.17/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_17_R1.class deleted file mode 100644 index d35dcd6d..00000000 Binary files a/1.17/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_17_R1.class and /dev/null differ diff --git a/1.17/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets_1_17_R1.class b/1.17/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets_1_17_R1.class deleted file mode 100644 index 4e68a89a..00000000 Binary files a/1.17/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets_1_17_R1.class and /dev/null differ diff --git a/1.17/build/libs/1.17.jar b/1.17/build/libs/1.17.jar index 4504dc70..198588d7 100644 Binary files a/1.17/build/libs/1.17.jar and b/1.17/build/libs/1.17.jar differ diff --git a/1.17/build/tmp/compileJava/previous-compilation-data.bin b/1.17/build/tmp/compileJava/previous-compilation-data.bin index 3de18d53..e6fffc93 100644 Binary files a/1.17/build/tmp/compileJava/previous-compilation-data.bin and b/1.17/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/1.18/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_18_R1.class b/1.18/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_18_R1.class deleted file mode 100644 index 8efca1be..00000000 Binary files a/1.18/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets_1_18_R1.class and /dev/null differ diff --git a/1.18/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_18_R1.class b/1.18/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_18_R1.class deleted file mode 100644 index 886aee05..00000000 Binary files a/1.18/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket_1_18_R1.class and /dev/null differ diff --git a/1.18/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets_1_18_R1.class b/1.18/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets_1_18_R1.class deleted file mode 100644 index c3e905a1..00000000 Binary files a/1.18/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets_1_18_R1.class and /dev/null differ diff --git a/1.18/build/libs/1.18.jar b/1.18/build/libs/1.18.jar index 8d6b3d9c..89a5eedb 100644 Binary files a/1.18/build/libs/1.18.jar and b/1.18/build/libs/1.18.jar differ diff --git a/1.18/build/tmp/compileJava/previous-compilation-data.bin b/1.18/build/tmp/compileJava/previous-compilation-data.bin index 7c279fd9..47511440 100644 Binary files a/1.18/build/tmp/compileJava/previous-compilation-data.bin and b/1.18/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/CosmeticsMenu.class b/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/CosmeticsMenu.class index 6f898b56..2375d554 100644 Binary files a/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/CosmeticsMenu.class and b/common/build/classes/java/main/io/github/fisher2911/hmccosmetics/gui/CosmeticsMenu.class differ diff --git a/common/build/tmp/compileJava/previous-compilation-data.bin b/common/build/tmp/compileJava/previous-compilation-data.bin index 6e89b7b9..4ce160e3 100644 Binary files a/common/build/tmp/compileJava/previous-compilation-data.bin and b/common/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/common/src/main/resources/tokens.yml b/common/src/main/resources/tokens.yml index 25716c19..dcc3edcd 100644 --- a/common/src/main/resources/tokens.yml +++ b/common/src/main/resources/tokens.yml @@ -4,4 +4,4 @@ tokens: material: emerald name: "Colorful hat token" commands: - - "lp user %player% permission set cosmetics.colorful_hat"op \ No newline at end of file + - "lp user %player% permission set cosmetics.colorful_hat" \ No newline at end of file diff --git a/nms/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets.class b/nms/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets.class deleted file mode 100644 index 7b46c0a1..00000000 Binary files a/nms/build/classes/java/main/io/github/fisher2911/nms/ArmorStandPackets.class and /dev/null differ diff --git a/nms/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket.class b/nms/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket.class deleted file mode 100644 index 8f194449..00000000 Binary files a/nms/build/classes/java/main/io/github/fisher2911/nms/DestroyPacket.class and /dev/null differ diff --git a/nms/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets.class b/nms/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets.class deleted file mode 100644 index 1dc88522..00000000 Binary files a/nms/build/classes/java/main/io/github/fisher2911/nms/PlayerPackets.class and /dev/null differ diff --git a/nms/build/libs/nms.jar b/nms/build/libs/nms.jar index b88d39dc..eacba5c7 100644 Binary files a/nms/build/libs/nms.jar and b/nms/build/libs/nms.jar differ diff --git a/nms/build/tmp/compileJava/previous-compilation-data.bin b/nms/build/tmp/compileJava/previous-compilation-data.bin index 0ebf9e27..7ffe7bbb 100644 Binary files a/nms/build/tmp/compileJava/previous-compilation-data.bin and b/nms/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/nms/src/main/java/io/github/fisher2911/nms/DestroyPacket.java b/nms/src/main/java/io/github/fisher2911/nms/DestroyPacket.java deleted file mode 100644 index 001519f8..00000000 --- a/nms/src/main/java/io/github/fisher2911/nms/DestroyPacket.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.fisher2911.nms; - -import com.comphenix.protocol.events.PacketContainer; - -public interface DestroyPacket { - - PacketContainer get(final int entityId); - -}