From a1d48d3b20f8794cf1cfa47a286ba7f19bdbce44 Mon Sep 17 00:00:00 2001 From: retrooper Date: Wed, 19 Aug 2020 16:46:21 +0200 Subject: [PATCH] Release 1.5.8.2 * Code cleanup * PacketReceiveEvent#getNMSPacketClass() deprecated * PacketReceiveEvent#getPacketName() deprecated * PacketSendEvent#getNMSPacketClass() deprecated * PacketSendEvent#getPacketName() deprecated * PlayerUninjectEvent#PlayerUninjectEvent(Player player, boolean sync) deprecated, use PlayerUninjectEvent#PlayerUninjectEvent(Player player) * WrappedPacketInBlockDig null pointers fixed for 1.7.10, just Direction field will be Direction.NULL, I will fix later * Clientbound wrappers cleaned up --- .../retrooper/packetevents/PacketEvents.java | 14 ++---- .../annotations/PacketHandler.java | 2 +- .../packetevents/enums/ClientVersion.java | 1 + .../data => enums}/EventSynchronization.java | 2 +- .../packetevents/enums/ServerVersion.java | 9 ++-- .../event/impl/BukkitMoveEvent.java | 8 ++-- .../event/impl/PacketReceiveEvent.java | 14 +++--- .../event/impl/PacketSendEvent.java | 15 +++---- .../event/impl/PlayerUninjectEvent.java | 12 ++++- .../event/manager/EventManager.java | 29 +++++------- .../packetevents/example/MainExample.java | 10 ----- .../handler/NettyPacketHandler.java | 4 +- .../handler/NettyPacketHandler_7.java | 6 +-- .../handler/NettyPacketHandler_8.java | 6 +-- .../packetevents/packet/PacketType.java | 19 ++++---- .../packet/PacketTypeClasses.java | 6 +-- .../packetwrappers/api/WrappedPacket.java | 5 +++ .../WrappedPacketInArmAnimation.java | 1 - .../in/blockdig/WrappedPacketInBlockDig.java | 9 ++-- .../WrappedPacketInClientCommand.java | 11 +++-- .../WrappedPacketInCustomPayload.java | 8 ++-- .../in/settings/WrappedPacketInSettings.java | 45 +++++++++---------- .../abilities/WrappedPacketOutAbilities.java | 2 +- .../animation/WrappedPacketOutAnimation.java | 2 +- .../out/chat/WrappedPacketOutChat.java | 2 +- .../out/entity/WrappedPacketOutEntity.java | 33 ++++++++------ .../WrappedPacketOutEntityVelocity.java | 2 +- .../keepalive/WrappedPacketOutKeepAlive.java | 22 +++++---- .../WrappedPacketOutKickDisconnect.java | 2 +- .../WrappedPacketOutPlayerInfo.java | 44 ------------------ .../WrappedPacketOutTransaction.java | 2 +- .../WrappedPacketOutUpdateHealth.java | 2 +- .../fielddata/FieldWithIndex.java | 12 ++--- .../fielddata/FieldWithName.java | 12 ++--- .../fielddata/FieldWithTypeAndIndex.java | 12 ++--- .../methoddata/MethodWithIndexAndParams.java | 12 ++--- .../packetevents/utils/NMSUtils.java | 2 +- .../onlineplayers/OnlinePlayerUtilities.java | 16 ------- .../onlineplayers/OnlinePlayerUtils_8.java | 12 ----- .../onlineplayers/OnlinePlayerUtils_9.java | 10 ----- 40 files changed, 165 insertions(+), 272 deletions(-) rename src/main/java/io/github/retrooper/packetevents/{annotations/data => enums}/EventSynchronization.java (55%) delete mode 100644 src/main/java/io/github/retrooper/packetevents/packetwrappers/out/playerinfo/WrappedPacketOutPlayerInfo.java delete mode 100644 src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtilities.java delete mode 100644 src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtils_8.java delete mode 100644 src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtils_9.java diff --git a/src/main/java/io/github/retrooper/packetevents/PacketEvents.java b/src/main/java/io/github/retrooper/packetevents/PacketEvents.java index a8a38aa8ca..b4366db1a9 100644 --- a/src/main/java/io/github/retrooper/packetevents/PacketEvents.java +++ b/src/main/java/io/github/retrooper/packetevents/PacketEvents.java @@ -1,17 +1,13 @@ package io.github.retrooper.packetevents; -import io.github.retrooper.packetevents.annotations.PacketHandler; import io.github.retrooper.packetevents.api.PacketEventsAPI; import io.github.retrooper.packetevents.enums.ClientVersion; import io.github.retrooper.packetevents.enums.ServerVersion; import io.github.retrooper.packetevents.event.PacketListener; import io.github.retrooper.packetevents.event.impl.BukkitMoveEvent; -import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent; import io.github.retrooper.packetevents.packet.PacketType; import io.github.retrooper.packetevents.packet.PacketTypeClasses; -import io.github.retrooper.packetevents.packetwrappers.in.settings.WrappedPacketInSettings; import io.github.retrooper.packetevents.settings.PacketEventsSettings; -import io.github.retrooper.packetevents.utils.onlineplayers.OnlinePlayerUtilities; import io.github.retrooper.packetevents.utils.versionlookup.VersionLookupUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -22,14 +18,12 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.plugin.Plugin; -import java.util.HashMap; - public final class PacketEvents implements PacketListener, Listener { - private static Plugin plugin; private static final PacketEventsAPI packetEventsAPI = new PacketEventsAPI(); private static final PacketEvents instance = new PacketEvents(); - private static boolean hasLoaded, hasStarted; private static final PacketEventsSettings settings = new PacketEventsSettings(); + private static Plugin plugin; + private static boolean hasLoaded, hasStarted; /** * Call this before start() @@ -60,7 +54,7 @@ public static void start(final Plugin pl) { Bukkit.getPluginManager().registerEvents(instance, plugin); - for (final Player p : OnlinePlayerUtilities.getOnlinePlayers()) { + for (final Player p : Bukkit.getOnlinePlayers()) { getAPI().getPlayerUtils().injectPlayer(p); } hasStarted = true; @@ -72,7 +66,7 @@ public static void start(final Plugin pl) { */ public static void stop() { if (hasStarted) { - for (final Player p : OnlinePlayerUtilities.getOnlinePlayers()) { + for (final Player p : Bukkit.getOnlinePlayers()) { getAPI().getPlayerUtils().uninjectPlayerNow(p); } diff --git a/src/main/java/io/github/retrooper/packetevents/annotations/PacketHandler.java b/src/main/java/io/github/retrooper/packetevents/annotations/PacketHandler.java index 3be2bf796c..1dc2fb2434 100644 --- a/src/main/java/io/github/retrooper/packetevents/annotations/PacketHandler.java +++ b/src/main/java/io/github/retrooper/packetevents/annotations/PacketHandler.java @@ -1,6 +1,6 @@ package io.github.retrooper.packetevents.annotations; -import io.github.retrooper.packetevents.annotations.data.EventSynchronization; +import io.github.retrooper.packetevents.enums.EventSynchronization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/io/github/retrooper/packetevents/enums/ClientVersion.java b/src/main/java/io/github/retrooper/packetevents/enums/ClientVersion.java index 47846d615b..c3a093d23b 100644 --- a/src/main/java/io/github/retrooper/packetevents/enums/ClientVersion.java +++ b/src/main/java/io/github/retrooper/packetevents/enums/ClientVersion.java @@ -11,6 +11,7 @@ public enum ClientVersion { v_1_15, v_1_15_1, v_1_15_2, v_1_16, v_1_16_PRE_1, v_1_16_PRE_2, v_1_16_PRE_3, v_1_16_PRE_4, v_1_16_PRE_5, v_1_16_PRE_6, v_1_16_PRE_7, v_1_16_PRE_8, v_1_16_RC_1, v_1_16_1, v_1_16_2, HIGHER_THAN_V_1_16_2, INVALID, ACCESS_FAILURE; private static final Map VERSION_LOOKUP = new HashMap(); + public static void prepareLookUp() { VERSION_LOOKUP.put(-1, ACCESS_FAILURE); VERSION_LOOKUP.put(1, LESS_THAN_V_1_7_10); diff --git a/src/main/java/io/github/retrooper/packetevents/annotations/data/EventSynchronization.java b/src/main/java/io/github/retrooper/packetevents/enums/EventSynchronization.java similarity index 55% rename from src/main/java/io/github/retrooper/packetevents/annotations/data/EventSynchronization.java rename to src/main/java/io/github/retrooper/packetevents/enums/EventSynchronization.java index e2622ca51d..4a85da34c4 100644 --- a/src/main/java/io/github/retrooper/packetevents/annotations/data/EventSynchronization.java +++ b/src/main/java/io/github/retrooper/packetevents/enums/EventSynchronization.java @@ -1,4 +1,4 @@ -package io.github.retrooper.packetevents.annotations.data; +package io.github.retrooper.packetevents.enums; public enum EventSynchronization { FORCE_SYNC, FORCE_ASYNC, NORMAL diff --git a/src/main/java/io/github/retrooper/packetevents/enums/ServerVersion.java b/src/main/java/io/github/retrooper/packetevents/enums/ServerVersion.java index 5ac81b7863..6109d8b5e1 100644 --- a/src/main/java/io/github/retrooper/packetevents/enums/ServerVersion.java +++ b/src/main/java/io/github/retrooper/packetevents/enums/ServerVersion.java @@ -3,8 +3,6 @@ import io.github.retrooper.packetevents.PacketEvents; import org.bukkit.Bukkit; -import java.util.HashMap; - /** * @author retrooper */ @@ -12,9 +10,10 @@ public enum ServerVersion { v_1_7_10, v_1_8, v_1_8_3, v_1_8_8, v_1_9, v_1_9_4, v_1_10, v_1_11, v_1_12, v_1_13, v_1_13_2, v_1_14, v_1_15, v_1_16, v_1_16_1, v_1_16_2, ERROR, EMPTY; - public static ServerVersion[] reversedValues; private static final String nmsVersionSuffix = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3]; + public static ServerVersion[] reversedValues; private static ServerVersion cachedVersion; + private static ServerVersion getVers() { for (final ServerVersion val : reversedValues) { String valName = val.name().substring(2).replace("_", "."); @@ -133,10 +132,10 @@ public int toProtocolVersion() { if (this.equals(ServerVersion.v_1_16)) { return 735; } - if(this.equals(ServerVersion.v_1_16_1)) { + if (this.equals(ServerVersion.v_1_16_1)) { return 736; } - if(this.equals(ServerVersion.v_1_16_2)) { + if (this.equals(ServerVersion.v_1_16_2)) { return 737; } return -1; diff --git a/src/main/java/io/github/retrooper/packetevents/event/impl/BukkitMoveEvent.java b/src/main/java/io/github/retrooper/packetevents/event/impl/BukkitMoveEvent.java index c433142597..b1397cb0b4 100644 --- a/src/main/java/io/github/retrooper/packetevents/event/impl/BukkitMoveEvent.java +++ b/src/main/java/io/github/retrooper/packetevents/event/impl/BukkitMoveEvent.java @@ -34,14 +34,14 @@ public Location getTo() { return to; } - public void setCancelled(final boolean val) { - this.cancelled = val; - } - public boolean isCancelled() { return cancelled; } + public void setCancelled(final boolean val) { + this.cancelled = val; + } + public void cancel() { setCancelled(true); } diff --git a/src/main/java/io/github/retrooper/packetevents/event/impl/PacketReceiveEvent.java b/src/main/java/io/github/retrooper/packetevents/event/impl/PacketReceiveEvent.java index ef68931f5b..5d66280164 100644 --- a/src/main/java/io/github/retrooper/packetevents/event/impl/PacketReceiveEvent.java +++ b/src/main/java/io/github/retrooper/packetevents/event/impl/PacketReceiveEvent.java @@ -24,8 +24,10 @@ public Player getPlayer() { } /** - * Get the packet's name (NMS packet class simple name) + * Get the packet's name (NMS packet class simple name). + * Deprecated, it is recommended not to use this for performance reasons. */ + @Deprecated public String getPacketName() { return this.packet.getClass().getSimpleName(); } @@ -41,11 +43,13 @@ public Object getNMSPacket() { /** * Get the class of the NMS packet object + * Deprecated, as it is useless, rather use getNMSPacket().getClass() * * @return packet object class */ + @Deprecated public Class getNMSPacketClass() { - return getNMSPacket().getClass(); + return packet.getClass(); } /** @@ -54,11 +58,7 @@ public Class getNMSPacketClass() { * @return packet id */ public byte getPacketId() { - Byte id = PacketType.Client.packetIds.get(getNMSPacketClass()); - if (id == null) { - return -1; - } - return id; + return PacketType.Client.packetIds.getOrDefault(packet.getClass(), (byte) -1); } /** diff --git a/src/main/java/io/github/retrooper/packetevents/event/impl/PacketSendEvent.java b/src/main/java/io/github/retrooper/packetevents/event/impl/PacketSendEvent.java index df9e8101b2..6fd6ad9f96 100644 --- a/src/main/java/io/github/retrooper/packetevents/event/impl/PacketSendEvent.java +++ b/src/main/java/io/github/retrooper/packetevents/event/impl/PacketSendEvent.java @@ -23,7 +23,9 @@ public Player getPlayer() { /** * Get the packet's name (NMS packet class simple name) + * Deprecated, it is recommended not to use this for performance reasons. */ + @Deprecated public String getPacketName() { return this.packet.getClass().getSimpleName(); } @@ -34,12 +36,7 @@ public String getPacketName() { * @return packet id */ public byte getPacketId() { - Byte id = - PacketType.Server.packetIds.get(getNMSPacketClass()); - if (id == null) { - return -1; - } - return id; + return PacketType.Server.packetIds.getOrDefault(packet.getClass(), (byte) -1); } /** @@ -52,12 +49,14 @@ public Object getNMSPacket() { } /** - * Get the class of the NMS packet object + * Get the class of the NMS packet object. + * Deprecated because it is useless, rather use getNMSPacket().getClass(). * * @return packet object class */ + @Deprecated public Class getNMSPacketClass() { - return getNMSPacket().getClass(); + return packet.getClass(); } public boolean isCancelled() { diff --git a/src/main/java/io/github/retrooper/packetevents/event/impl/PlayerUninjectEvent.java b/src/main/java/io/github/retrooper/packetevents/event/impl/PlayerUninjectEvent.java index 9335902b84..840636ad8c 100644 --- a/src/main/java/io/github/retrooper/packetevents/event/impl/PlayerUninjectEvent.java +++ b/src/main/java/io/github/retrooper/packetevents/event/impl/PlayerUninjectEvent.java @@ -5,14 +5,20 @@ public final class PlayerUninjectEvent extends PacketEvent { private final Player player; - private boolean cancelled; private final boolean sync; + private boolean cancelled; - public PlayerUninjectEvent(final Player player, final boolean sync) { + @Deprecated + public PlayerUninjectEvent(final Player player, @Deprecated final boolean sync) { this.player = player; this.sync = sync; } + public PlayerUninjectEvent(final Player player) { + this.player = player; + this.sync = true; + } + public void cancel() { setCancelled(true); } @@ -31,7 +37,9 @@ public void setCancelled(final boolean val) { * By default all uninjections are called aynchronously in this build. * * @return If the uninjection was done async or sync + * @deprecated because it is unneeded */ + @Deprecated public boolean isSync() { return sync; } diff --git a/src/main/java/io/github/retrooper/packetevents/event/manager/EventManager.java b/src/main/java/io/github/retrooper/packetevents/event/manager/EventManager.java index a32647810e..f508f3ca3f 100644 --- a/src/main/java/io/github/retrooper/packetevents/event/manager/EventManager.java +++ b/src/main/java/io/github/retrooper/packetevents/event/manager/EventManager.java @@ -2,7 +2,6 @@ import io.github.retrooper.packetevents.PacketEvents; import io.github.retrooper.packetevents.annotations.PacketHandler; -import io.github.retrooper.packetevents.annotations.data.EventSynchronization; import io.github.retrooper.packetevents.event.PacketEvent; import io.github.retrooper.packetevents.event.PacketListener; import org.bukkit.Bukkit; @@ -12,21 +11,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; public final class EventManager { - private final ExecutorService executorService; private final HashMap> registeredMethods = new HashMap>(); - public EventManager(final int threadCount) { - executorService = Executors.newFixedThreadPool(threadCount); - } - - public EventManager() { - this(Runtime.getRuntime().availableProcessors()); - } - public void callEvent(final PacketEvent e) { for (final PacketListener listener : registeredMethods.keySet()) { //Annotated methods @@ -46,12 +34,17 @@ public void run() { } } }; - if (annotation.synchronization() == EventSynchronization.FORCE_ASYNC) { - executorService.execute(invokeMethod); - } else if (annotation.synchronization() == EventSynchronization.FORCE_SYNC) { - Bukkit.getScheduler().runTask(PacketEvents.getPlugin(), invokeMethod); - } else { - invokeMethod.run(); + + switch (annotation.synchronization()) { + case FORCE_ASYNC: + Bukkit.getScheduler().runTaskAsynchronously(PacketEvents.getPlugin(), invokeMethod); + break; + case FORCE_SYNC: + Bukkit.getScheduler().runTask(PacketEvents.getPlugin(), invokeMethod); + break; + default: + invokeMethod.run(); + break; } } } diff --git a/src/main/java/io/github/retrooper/packetevents/example/MainExample.java b/src/main/java/io/github/retrooper/packetevents/example/MainExample.java index e01daa016a..91a10595d5 100644 --- a/src/main/java/io/github/retrooper/packetevents/example/MainExample.java +++ b/src/main/java/io/github/retrooper/packetevents/example/MainExample.java @@ -1,17 +1,7 @@ package io.github.retrooper.packetevents.example; import io.github.retrooper.packetevents.PacketEvents; -import io.github.retrooper.packetevents.annotations.PacketHandler; -import io.github.retrooper.packetevents.enums.Direction; -import io.github.retrooper.packetevents.enums.minecraft.PlayerDigType; import io.github.retrooper.packetevents.event.PacketListener; -import io.github.retrooper.packetevents.event.impl.PacketReceiveEvent; -import io.github.retrooper.packetevents.packet.PacketType; -import io.github.retrooper.packetevents.packetwrappers.in.armanimation.WrappedPacketInArmAnimation; -import io.github.retrooper.packetevents.packetwrappers.in.blockdig.WrappedPacketInBlockDig; -import io.github.retrooper.packetevents.packetwrappers.in.custompayload.WrappedPacketInCustomPayload; -import io.github.retrooper.packetevents.packetwrappers.in.helditemslot.WrappedPacketInHeldItemSlot; -import io.github.retrooper.packetevents.packetwrappers.in.settings.WrappedPacketInSettings; import org.bukkit.plugin.java.JavaPlugin; public class MainExample extends JavaPlugin implements PacketListener { diff --git a/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler.java b/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler.java index 5f3bbacc92..be52f7b15c 100644 --- a/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler.java +++ b/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler.java @@ -34,7 +34,7 @@ public static void injectPlayer(final Player player) { public static Future uninjectPlayer(final Player player) { try { - final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player, false); + final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player); PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent); if (!uninjectEvent.isCancelled()) { if (v1_7_nettyMode) { @@ -51,7 +51,7 @@ public static Future uninjectPlayer(final Player player) { public static void uninjectPlayerNow(final Player player) { try { - final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player, true); + final PlayerUninjectEvent uninjectEvent = new PlayerUninjectEvent(player); PacketEvents.getAPI().getEventManager().callEvent(uninjectEvent); if (!uninjectEvent.isCancelled()) { if (v1_7_nettyMode) { diff --git a/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_7.java b/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_7.java index 545d4d37d9..41def335c4 100644 --- a/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_7.java +++ b/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_7.java @@ -2,11 +2,7 @@ import io.github.retrooper.packetevents.PacketEvents; import io.github.retrooper.packetevents.utils.NMSUtils; -import net.minecraft.util.io.netty.channel.Channel; -import net.minecraft.util.io.netty.channel.ChannelDuplexHandler; -import net.minecraft.util.io.netty.channel.ChannelHandlerContext; -import net.minecraft.util.io.netty.channel.ChannelPipeline; -import net.minecraft.util.io.netty.channel.ChannelPromise; +import net.minecraft.util.io.netty.channel.*; import org.bukkit.entity.Player; import java.util.concurrent.Future; diff --git a/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_8.java b/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_8.java index 954e4c0957..67c56d56e8 100644 --- a/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_8.java +++ b/src/main/java/io/github/retrooper/packetevents/handler/NettyPacketHandler_8.java @@ -2,11 +2,7 @@ import io.github.retrooper.packetevents.PacketEvents; import io.github.retrooper.packetevents.utils.NMSUtils; -import io.netty.channel.Channel; -import io.netty.channel.ChannelDuplexHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelPipeline; -import io.netty.channel.ChannelPromise; +import io.netty.channel.*; import org.bukkit.entity.Player; import java.util.concurrent.Future; diff --git a/src/main/java/io/github/retrooper/packetevents/packet/PacketType.java b/src/main/java/io/github/retrooper/packetevents/packet/PacketType.java index 9ca5d3c309..9b4e65f920 100644 --- a/src/main/java/io/github/retrooper/packetevents/packet/PacketType.java +++ b/src/main/java/io/github/retrooper/packetevents/packet/PacketType.java @@ -7,17 +7,7 @@ public class PacketType { public static class Client { - public static class Util { - public static boolean isInstanceOfFlying(final byte packetId) { - return packetId == FLYING - || packetId == POSITION - || packetId == POSITION_LOOK - || packetId == LOOK; - } - } - public static final Map, Byte> packetIds = new HashMap, Byte>(); - public static final byte TELEPORT_ACCEPT = 0, TILE_NBT_QUERY = 1, DIFFICULTY_CHANGE = 2, CHAT = 3, CLIENT_COMMAND = 4, SETTINGS = 5, TAB_COMPLETE = 6, TRANSACTION = 7, ENCHANT_ITEM = 8, @@ -81,6 +71,15 @@ public static void init() { packetIds.put(PacketTypeClasses.Client.USE_ITEM, USE_ITEM); packetIds.put(PacketTypeClasses.Client.BLOCK_PLACE, BLOCK_PLACE); } + + public static class Util { + public static boolean isInstanceOfFlying(final byte packetId) { + return packetId == FLYING + || packetId == POSITION + || packetId == POSITION_LOOK + || packetId == LOOK; + } + } } public static class Server { diff --git a/src/main/java/io/github/retrooper/packetevents/packet/PacketTypeClasses.java b/src/main/java/io/github/retrooper/packetevents/packet/PacketTypeClasses.java index 882707f8d5..bff56b33ca 100644 --- a/src/main/java/io/github/retrooper/packetevents/packet/PacketTypeClasses.java +++ b/src/main/java/io/github/retrooper/packetevents/packet/PacketTypeClasses.java @@ -6,6 +6,9 @@ public class PacketTypeClasses { public static class Client { + private static final String c = "PacketPlayIn"; + @Nullable + public static final Class FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying"); public static Class POSITION, POSITION_LOOK, LOOK, CLIENT_COMMAND, TRANSACTION, BLOCK_DIG, ENTITY_ACTION, USE_ENTITY, WINDOW_CLICK, STEER_VEHICLE, CUSTOM_PAYLOAD, ARM_ANIMATION, @@ -17,9 +20,6 @@ public static class Client { AUTO_RECIPE, RECIPE_DISPLAYED, ITEM_NAME, RESOURCE_PACK_STATUS, ADVANCEMENTS, TR_SEL, BEACON, SET_COMMAND_BLOCK, SET_COMMAND_MINECART, SET_JIGSAW, STRUCT, UPDATE_SIGN, SPECTATE; - private static final String c = "PacketPlayIn"; - @Nullable - public static final Class FLYING = NMSUtils.getNMSClassWithoutException(c + "Flying"); public static void load() { try { diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/api/WrappedPacket.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/api/WrappedPacket.java index 140a97fff2..de6d14d941 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/api/WrappedPacket.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/api/WrappedPacket.java @@ -8,6 +8,11 @@ public class WrappedPacket { protected final Player player; protected Object packet; + public WrappedPacket() { + this.player= null; + this.packet = null; + } + public WrappedPacket(final Object packet) { this.player = null; if (packet == null) return; diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/armanimation/WrappedPacketInArmAnimation.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/armanimation/WrappedPacketInArmAnimation.java index a76583c0f0..a08f05781c 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/armanimation/WrappedPacketInArmAnimation.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/armanimation/WrappedPacketInArmAnimation.java @@ -1,7 +1,6 @@ package io.github.retrooper.packetevents.packetwrappers.in.armanimation; import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket; -import io.github.retrooper.packetevents.reflectionutils.Reflection; import io.github.retrooper.packetevents.utils.NMSUtils; //TODO: Test on 1.9, 1.11, 1.13, 1.14 diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockdig/WrappedPacketInBlockDig.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockdig/WrappedPacketInBlockDig.java index df61ae4136..980b3bc9be 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockdig/WrappedPacketInBlockDig.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/blockdig/WrappedPacketInBlockDig.java @@ -8,8 +8,6 @@ import io.github.retrooper.packetevents.utils.NMSUtils; import io.github.retrooper.packetevents.utils.vector.Vector3i; -import java.util.Vector; - public final class WrappedPacketInBlockDig extends WrappedPacket { private static Class blockDigClass, blockPositionClass, enumDirectionClass, digTypeClass; @@ -25,7 +23,7 @@ public final class WrappedPacketInBlockDig extends WrappedPacket { e.printStackTrace(); } - if(version.isHigherThan(ServerVersion.v_1_7_10)) { + if (version.isHigherThan(ServerVersion.v_1_7_10)) { try { digTypeClass = NMSUtils.getNMSClass("EnumPlayerDigType"); } catch (ClassNotFoundException e) { @@ -74,10 +72,9 @@ protected void setup() { e.printStackTrace(); } this.blockPosition = new Vector3i(x, y, z); - if(enumDirection == null) { + if (enumDirection == null) { this.direction = Direction.NULL; - } - else { + } else { this.direction = enumDirection; } this.digType = enumDigType; diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/clientcommand/WrappedPacketInClientCommand.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/clientcommand/WrappedPacketInClientCommand.java index 40510dcb68..eb795ebca4 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/clientcommand/WrappedPacketInClientCommand.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/clientcommand/WrappedPacketInClientCommand.java @@ -2,7 +2,6 @@ import io.github.retrooper.packetevents.annotations.Nullable; import io.github.retrooper.packetevents.enums.ServerVersion; -import io.github.retrooper.packetevents.enums.minecraft.PlayerAction; import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket; import io.github.retrooper.packetevents.reflectionutils.Reflection; import io.github.retrooper.packetevents.utils.NMSUtils; @@ -16,9 +15,9 @@ public final class WrappedPacketInClientCommand extends WrappedPacket { static { try { packetClass = NMSUtils.getNMSClass("PacketPlayInClientCommand"); - if(version.isHigherThan(ServerVersion.v_1_7_10)) { + if (version.isHigherThan(ServerVersion.v_1_7_10)) { enumClientCommandClass = Reflection.getSubClass(packetClass, "EnumClientCommand"); - }else { + } else { enumClientCommandClass = NMSUtils.getNMSClass("EnumClientCommand"); } } catch (Exception e) { @@ -35,7 +34,7 @@ public WrappedPacketInClientCommand(Object packet) { @Override public void setup() { try { - if(version.isLowerThan(ServerVersion.v_1_8)) { + if (version.isLowerThan(ServerVersion.v_1_8)) { clientCommand = ClientCommand.get(Reflection.getField(enumClientCommandClass, int.class, 1).getInt(packet)); } else { final Object enumObj = Reflection.getField(packetClass, enumClientCommandClass, 0).get(packet); @@ -50,12 +49,12 @@ public ClientCommand getClientCommand() { return clientCommand; } - public static enum ClientCommand { + public enum ClientCommand { PERFORM_RESPAWN, REQUEST_STATS, OPEN_INVENTORY_ACHIEVEMENT; - private ClientCommand() { + ClientCommand() { } public static ClientCommand get(final int i) { diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/custompayload/WrappedPacketInCustomPayload.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/custompayload/WrappedPacketInCustomPayload.java index e8b6eb0d6d..52c2d41dc6 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/custompayload/WrappedPacketInCustomPayload.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/custompayload/WrappedPacketInCustomPayload.java @@ -14,7 +14,7 @@ public final class WrappedPacketInCustomPayload extends WrappedPacket { } catch (Exception e) { e.printStackTrace(); } - try{ + try { //Only on 1.13+ nmsMinecraftKey = NMSUtils.getNMSClass("MinecraftKey"); } catch (Exception e) { @@ -31,7 +31,7 @@ public WrappedPacketInCustomPayload(Object packet) { @Override public void setup() { - if(Reflection.getField(packetClass, String.class, 0) == null) { + if (Reflection.getField(packetClass, String.class, 0) == null) { try { this.minecraftKey = Reflection.getField(packetClass, nmsMinecraftKey, 0).get(packet); this.dataSerializer = Reflection.getField(packetClass, nmsPacketDataSerializer, 0).get(packet); @@ -40,7 +40,7 @@ public void setup() { } } else { try { - this.data = (String)Reflection.getField(packetClass, String.class, 0).get(packet); + this.data = (String) Reflection.getField(packetClass, String.class, 0).get(packet); this.dataSerializer = Reflection.getField(packetClass, nmsPacketDataSerializer, 0).get(packet); } catch (Exception e) { //intentionally empty, allegedly 1.7.10 produces a NPE? @@ -51,7 +51,7 @@ public void setup() { public String getData() { return data; } - + public Object getMinecraftKey() { return minecraftKey; } diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/settings/WrappedPacketInSettings.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/settings/WrappedPacketInSettings.java index 0fff68290a..34eadcbc55 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/settings/WrappedPacketInSettings.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/in/settings/WrappedPacketInSettings.java @@ -11,6 +11,7 @@ public class WrappedPacketInSettings extends WrappedPacket { private static Class packetClass; private static Class chatVisibilityEnumClass; + static { try { packetClass = NMSUtils.getNMSClass("PacketPlayInSettings"); @@ -27,25 +28,19 @@ public class WrappedPacketInSettings extends WrappedPacket { } } - public enum ChatVisibility { - ENABLED, COMMANDS_ONLY, HIDDEN - } - - - public enum DisplayedSkinPart { - CAPE, JACKET, LEFT_SLEEVE, RIGHT_SLEEVE, LEFT_PANTS, RIGHT_PANTS, HAT - } - private String locale; private byte viewDistance; private ChatVisibility chatVisibility; private boolean chatColors; private HashMap displayedSkinParts; - public WrappedPacketInSettings(final Object packet) { super(packet); } + public static Class getChatVisibilityEnumClass() { + return chatVisibilityEnumClass; + } + @Override protected void setup() { try { @@ -57,13 +52,11 @@ protected void setup() { //CHAT VISIBILITY Object chatVisibilityEnumObject = Reflection.getField(packetClass, chatVisibilityEnumClass, 0).get(packet); String enumValueAsString = chatVisibilityEnumObject.toString(); - if(enumValueAsString.equals("FULL")) { + if (enumValueAsString.equals("FULL")) { chatVisibility = ChatVisibility.ENABLED; - } - else if(enumValueAsString.equals("SYSTEM")) { + } else if (enumValueAsString.equals("SYSTEM")) { chatVisibility = ChatVisibility.COMMANDS_ONLY; - } - else { + } else { chatVisibility = ChatVisibility.HIDDEN; } @@ -73,12 +66,11 @@ else if(enumValueAsString.equals("SYSTEM")) { //DISPLAYED SKIN PARTS this.displayedSkinParts = new HashMap(); - if(version.isLowerThan(ServerVersion.v_1_8)) { + if (version.isLowerThan(ServerVersion.v_1_8)) { //in 1.7.10 only the cape display skin part is sent boolean capeEnabled = Reflection.getField(packetClass, boolean.class, 1).getBoolean(packet); displayedSkinParts.put(DisplayedSkinPart.CAPE, capeEnabled); - } - else { + } else { //in 1.8, all the skin parts are sent int skinPartFlags = Reflection.getField(packetClass, int.class, 1).getInt(packet); displayedSkinParts.put(DisplayedSkinPart.CAPE, (skinPartFlags & 0x01) != 0); @@ -96,10 +88,6 @@ else if(enumValueAsString.equals("SYSTEM")) { } - public static Class getChatVisibilityEnumClass() { - return chatVisibilityEnumClass; - } - public String getLocale() { return locale; } @@ -129,14 +117,23 @@ public HashMap getDisplayedSkinPartsMap() { /** * On 1.7.10, some skin parts will default to 'false' as 1.7.10 * only sends the 'cape' skin part. + * * @param part * @return */ public boolean isDisplaySkinPartEnabled(DisplayedSkinPart part) { //1.7.10, we will default the other skin parts to return false. - if(!displayedSkinParts.containsKey(part)) { - return false; + if (!displayedSkinParts.containsKey(part)) { + return false; } return displayedSkinParts.get(part); } + + public enum ChatVisibility { + ENABLED, COMMANDS_ONLY, HIDDEN + } + + public enum DisplayedSkinPart { + CAPE, JACKET, LEFT_SLEEVE, RIGHT_SLEEVE, LEFT_PANTS, RIGHT_PANTS, HAT + } } diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/abilities/WrappedPacketOutAbilities.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/abilities/WrappedPacketOutAbilities.java index 11b5c7b939..36a155a5d1 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/abilities/WrappedPacketOutAbilities.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/abilities/WrappedPacketOutAbilities.java @@ -35,7 +35,7 @@ public WrappedPacketOutAbilities(final Object packet) { public WrappedPacketOutAbilities(final boolean isVulnerable, final boolean isFlying, final boolean allowFlight, final boolean canBuildInstantly, final float flySpeed, final float walkSpeed) { - super(null); + super(); this.vulnerable = isVulnerable; this.flying = isFlying; this.allowFlight = allowFlight; diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/animation/WrappedPacketOutAnimation.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/animation/WrappedPacketOutAnimation.java index c862c67919..227672248d 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/animation/WrappedPacketOutAnimation.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/animation/WrappedPacketOutAnimation.java @@ -38,7 +38,7 @@ public WrappedPacketOutAnimation(final Object packet) { } public WrappedPacketOutAnimation(final Entity target, final EntityAnimationType type) { - super(null); + super(); this.entityID = target.getEntityId(); this.entity = target; this.type = type; diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/chat/WrappedPacketOutChat.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/chat/WrappedPacketOutChat.java index 27f4c56aef..20ae0304a4 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/chat/WrappedPacketOutChat.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/chat/WrappedPacketOutChat.java @@ -44,7 +44,7 @@ public WrappedPacketOutChat(final Object packet) { } public WrappedPacketOutChat(final String message) { - super(null); + super(); this.message = "{\"text\": \"" + message + "\"}"; } diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entity/WrappedPacketOutEntity.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entity/WrappedPacketOutEntity.java index 5c99d41ac1..3ff376c997 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entity/WrappedPacketOutEntity.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entity/WrappedPacketOutEntity.java @@ -4,13 +4,25 @@ import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket; import io.github.retrooper.packetevents.reflectionutils.Reflection; import io.github.retrooper.packetevents.utils.NMSUtils; +import org.bukkit.entity.Entity; public class WrappedPacketOutEntity extends WrappedPacket { - private int entityId; + private static Class packetClass; + + static { + try { + packetClass = NMSUtils.getNMSClass("PacketPlayOutEntity"); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } + + private int entityID; private double deltaX, deltaY, deltaZ; private byte yaw, pitch; private boolean onGround; + public WrappedPacketOutEntity(Object packet) { super(packet); } @@ -18,7 +30,7 @@ public WrappedPacketOutEntity(Object packet) { @Override protected void setup() { try { - this.entityId = Reflection.getField(packetClass, int.class, 0).getInt(packet); + this.entityID = Reflection.getField(packetClass, int.class, 0).getInt(packet); this.onGround = Reflection.getField(packetClass, boolean.class, 0).getBoolean(packet); if (version.isLowerThan(ServerVersion.v_1_9)) { byte dX = Reflection.getField(packetClass, byte.class, 0).getByte(packet); @@ -49,7 +61,6 @@ protected void setup() { } - public byte getPitch() { return pitch; } @@ -70,21 +81,15 @@ public double getDeltaX() { return deltaX; } + public Entity getEntity() { + return NMSUtils.getEntityById(entityID); + } + public int getEntityId() { - return entityId; + return entityID; } public boolean isOnGround() { return onGround; } - - private static Class packetClass; - - static { - try { - packetClass = NMSUtils.getNMSClass("PacketPlayOutEntity"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - } } diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entityvelocity/WrappedPacketOutEntityVelocity.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entityvelocity/WrappedPacketOutEntityVelocity.java index 7a0cc7c671..fee1b61283 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entityvelocity/WrappedPacketOutEntityVelocity.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/entityvelocity/WrappedPacketOutEntityVelocity.java @@ -54,7 +54,7 @@ public WrappedPacketOutEntityVelocity(final Object packet) { } public WrappedPacketOutEntityVelocity(final Entity entity, final double velocityX, final double velocityY, final double velocityZ) { - super(null); + super(); this.entityId = entity.getEntityId(); this.entity = entity; this.velocityX = velocityX; diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/keepalive/WrappedPacketOutKeepAlive.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/keepalive/WrappedPacketOutKeepAlive.java index 73e0d473d4..f29494c122 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/keepalive/WrappedPacketOutKeepAlive.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/keepalive/WrappedPacketOutKeepAlive.java @@ -3,9 +3,18 @@ import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket; import io.github.retrooper.packetevents.reflectionutils.Reflection; import io.github.retrooper.packetevents.utils.NMSUtils; -import net.minecraft.server.v1_8_R3.PacketPlayOutKeepAlive; public class WrappedPacketOutKeepAlive extends WrappedPacket { + private static Class packetClass; + + static { + try { + packetClass = NMSUtils.getNMSClass("PacketPlayOutKeepAlive"); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } + private long id; public WrappedPacketOutKeepAlive(Object packet) { @@ -38,15 +47,4 @@ protected void setup() { } } } - - private static Class packetClass; - - static { - try { - packetClass = NMSUtils.getNMSClass("PacketPlayOutKeepAlive"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - PacketPlayOutKeepAlive p; - } } diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/kickdisconnect/WrappedPacketOutKickDisconnect.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/kickdisconnect/WrappedPacketOutKickDisconnect.java index a2a9275183..269b7dc1b2 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/kickdisconnect/WrappedPacketOutKickDisconnect.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/kickdisconnect/WrappedPacketOutKickDisconnect.java @@ -35,7 +35,7 @@ public WrappedPacketOutKickDisconnect(final Object packet) { } public WrappedPacketOutKickDisconnect(final String kickMessage) { - super(null); + super(); this.kickMessage = kickMessage; } diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/playerinfo/WrappedPacketOutPlayerInfo.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/playerinfo/WrappedPacketOutPlayerInfo.java deleted file mode 100644 index c8aadf03e5..0000000000 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/playerinfo/WrappedPacketOutPlayerInfo.java +++ /dev/null @@ -1,44 +0,0 @@ -package io.github.retrooper.packetevents.packetwrappers.out.playerinfo; - -import io.github.retrooper.packetevents.enums.minecraft.Gamemode; -import io.github.retrooper.packetevents.enums.minecraft.PlayerInfoAction; -import io.github.retrooper.packetevents.packetwrappers.api.WrappedPacket; -import io.github.retrooper.packetevents.reflectionutils.Reflection; -import io.github.retrooper.packetevents.utils.NMSUtils; -import net.minecraft.server.v1_8_R3.PacketPlayOutPlayerInfo; - -public class WrappedPacketOutPlayerInfo extends WrappedPacket { - private PlayerInfoAction action; - - public WrappedPacketOutPlayerInfo(Object packet) { - super(packet); - } - - @Override - protected void setup() { - PacketPlayOutPlayerInfo.PlayerInfoData dl; - } - - private static Class packetClass, enumPlayerInfoActionClass; - - static { - try { - packetClass = NMSUtils.getNMSClass("PacketPlayOutPlayerInfo"); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - - try { - enumPlayerInfoActionClass = NMSUtils.getNMSClass("EnumPLayerInfoAction"); - } catch (ClassNotFoundException e) { - enumPlayerInfoActionClass = Reflection.getSubClass(packetClass, "EnumPlayerInfoAction"); - } - } - - public class PlayerDataInfo { - public PlayerDataInfo(Object gameProfile, int var, Gamemode gamemode, String s) { - - } - } - -} diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/transaction/WrappedPacketOutTransaction.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/transaction/WrappedPacketOutTransaction.java index 23daa0d5f3..b4cbd2b9f2 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/transaction/WrappedPacketOutTransaction.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/transaction/WrappedPacketOutTransaction.java @@ -35,7 +35,7 @@ public WrappedPacketOutTransaction(final Object packet) { } public WrappedPacketOutTransaction(final int windowId, final short actionNumber, final boolean accepted) { - super(null); + super(); this.windowId = windowId; this.actionNumber = actionNumber; this.accepted = accepted; diff --git a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/updatehealth/WrappedPacketOutUpdateHealth.java b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/updatehealth/WrappedPacketOutUpdateHealth.java index e4c6426924..4e11787c2d 100644 --- a/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/updatehealth/WrappedPacketOutUpdateHealth.java +++ b/src/main/java/io/github/retrooper/packetevents/packetwrappers/out/updatehealth/WrappedPacketOutUpdateHealth.java @@ -41,7 +41,7 @@ public WrappedPacketOutUpdateHealth(final Object packet) { * @param foodSaturation */ public WrappedPacketOutUpdateHealth(final float health, final int food, final float foodSaturation) { - super(null); + super(); this.health = health; this.food = food; this.foodSaturation = foodSaturation; diff --git a/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithIndex.java b/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithIndex.java index 5e7d62fb54..8a9e8e4827 100644 --- a/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithIndex.java +++ b/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithIndex.java @@ -18,7 +18,7 @@ public Class getCls() { public int getIndex() { return index; } - + @Override public boolean equals(Object o) { if (this == o) return true; @@ -27,10 +27,10 @@ public boolean equals(Object o) { return index == that.index && Objects.equals(cls, that.cls); } - + @Override - public int hashCode() { - return Objects.hash(cls, index); - } - + public int hashCode() { + return Objects.hash(cls, index); + } + } diff --git a/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithName.java b/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithName.java index f1ae9a533d..929feba677 100644 --- a/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithName.java +++ b/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithName.java @@ -19,7 +19,7 @@ public Class getCls() { public String getName() { return name; } - + @Override public boolean equals(Object o) { if (this == o) return true; @@ -28,10 +28,10 @@ public boolean equals(Object o) { return name.equals(that.name) && Objects.equals(cls, that.cls); } - + @Override - public int hashCode() { - return Objects.hash(cls, name); - } - + public int hashCode() { + return Objects.hash(cls, name); + } + } diff --git a/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithTypeAndIndex.java b/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithTypeAndIndex.java index 59b3131fe7..277a702cb6 100644 --- a/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithTypeAndIndex.java +++ b/src/main/java/io/github/retrooper/packetevents/reflectionutils/fielddata/FieldWithTypeAndIndex.java @@ -23,7 +23,7 @@ public Class getType() { public int getIndex() { return index; } - + @Override public boolean equals(Object o) { if (this == o) return true; @@ -33,10 +33,10 @@ public boolean equals(Object o) { Objects.equals(cls, that.cls) && Objects.equals(type, that.type); } - + @Override - public int hashCode() { - return Objects.hash(cls, type, index); - } - + public int hashCode() { + return Objects.hash(cls, type, index); + } + } diff --git a/src/main/java/io/github/retrooper/packetevents/reflectionutils/methoddata/MethodWithIndexAndParams.java b/src/main/java/io/github/retrooper/packetevents/reflectionutils/methoddata/MethodWithIndexAndParams.java index 18bd9c26a6..28ba383e4b 100644 --- a/src/main/java/io/github/retrooper/packetevents/reflectionutils/methoddata/MethodWithIndexAndParams.java +++ b/src/main/java/io/github/retrooper/packetevents/reflectionutils/methoddata/MethodWithIndexAndParams.java @@ -24,7 +24,7 @@ public int getIndex() { public Class[] getParams() { return params; } - + @Override public boolean equals(Object o) { if (this == o) return true; @@ -34,10 +34,10 @@ public boolean equals(Object o) { Objects.equals(cls, that.cls) && Objects.equals(params, that.params); } - + @Override - public int hashCode() { - return Objects.hash(cls, params, index); - } - + public int hashCode() { + return Objects.hash(cls, params, index); + } + } diff --git a/src/main/java/io/github/retrooper/packetevents/utils/NMSUtils.java b/src/main/java/io/github/retrooper/packetevents/utils/NMSUtils.java index 1b18731ca4..fe0d87ee5c 100644 --- a/src/main/java/io/github/retrooper/packetevents/utils/NMSUtils.java +++ b/src/main/java/io/github/retrooper/packetevents/utils/NMSUtils.java @@ -16,9 +16,9 @@ public final class NMSUtils { private static final ServerVersion version = ServerVersion.getVersion(); - public static String nettyPrefix; private static final String nmsDir = ServerVersion.getNMSDirectory(); private static final String obcDir = ServerVersion.getOBCDirectory(); + public static String nettyPrefix; public static Class minecraftServerClass, craftWorldsClass, packetClass, entityPlayerClass, playerConnectionClass, craftPlayerClass, serverConnectionClass, craftEntityClass, diff --git a/src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtilities.java b/src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtilities.java deleted file mode 100644 index 83687f0e93..0000000000 --- a/src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtilities.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.github.retrooper.packetevents.utils.onlineplayers; - -import io.github.retrooper.packetevents.enums.ServerVersion; -import org.bukkit.entity.Player; - -public class OnlinePlayerUtilities { - private static final ServerVersion version = ServerVersion.getVersion(); - - public static Player[] getOnlinePlayers() { - if (version.isLowerThan(ServerVersion.v_1_9)) { - return OnlinePlayerUtils_8.getOnlinePlayers(); - } else { - return OnlinePlayerUtils_9.getOnlinePlayers(); - } - } -} diff --git a/src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtils_8.java b/src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtils_8.java deleted file mode 100644 index 1012eb965f..0000000000 --- a/src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtils_8.java +++ /dev/null @@ -1,12 +0,0 @@ -package io.github.retrooper.packetevents.utils.onlineplayers; - -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; - - -public class OnlinePlayerUtils_8 { - public static Player[] getOnlinePlayers() { - - return Bukkit.getServer().getOnlinePlayers().toArray(new Player[0]); - } -} diff --git a/src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtils_9.java b/src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtils_9.java deleted file mode 100644 index 7e520b592e..0000000000 --- a/src/main/java/io/github/retrooper/packetevents/utils/onlineplayers/OnlinePlayerUtils_9.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.github.retrooper.packetevents.utils.onlineplayers; - -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; - -public class OnlinePlayerUtils_9 { - public static Player[] getOnlinePlayers() { - return Bukkit.getOnlinePlayers().toArray(new Player[0]); - } -}