From 1e9c51be2e86cdc728b2adf34c48e518a0f6faf2 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 8 Jan 2021 08:11:05 +0000 Subject: [PATCH] Updated packet adapters --- .../willfp/ecoenchants/display/packets/PacketChat.java | 8 +++++--- .../display/packets/PacketOpenWindowMerchant.java | 4 +++- .../display/packets/PacketSetCreativeSlot.java | 4 +++- .../willfp/ecoenchants/display/packets/PacketSetSlot.java | 4 +++- .../ecoenchants/display/packets/PacketWindowItems.java | 4 +++- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java index 94698e78..3903acbf 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketChat.java @@ -4,10 +4,11 @@ import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.ListenerPriority; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.wrappers.WrappedChatComponent; -import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy; import com.willfp.eco.util.ProxyUtils; -import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.protocollib.AbstractPacketAdapter; +import com.willfp.ecoenchants.proxy.proxies.ChatComponentProxy; +import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; public class PacketChat extends AbstractPacketAdapter { @@ -21,7 +22,8 @@ public class PacketChat extends AbstractPacketAdapter { } @Override - public void onSend(@NotNull final PacketContainer packet) { + public void onSend(@NotNull final PacketContainer packet, + @NotNull final Player player) { for (int i = 0; i < packet.getChatComponents().size(); i++) { WrappedChatComponent component = packet.getChatComponents().read(i); if (component == null) { diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java index eab6bd55..24f5aa5f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java @@ -8,6 +8,7 @@ import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget; +import org.bukkit.entity.Player; import org.bukkit.inventory.MerchantRecipe; import org.jetbrains.annotations.NotNull; @@ -25,7 +26,8 @@ public class PacketOpenWindowMerchant extends AbstractPacketAdapter { } @Override - public void onSend(@NotNull final PacketContainer packet) { + public void onSend(@NotNull final PacketContainer packet, + @NotNull final Player player) { List recipes = packet.getMerchantRecipeLists().readSafely(0); recipes = recipes.stream().peek(merchantRecipe -> { diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java index ebcd9032..42f237ff 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java @@ -6,6 +6,7 @@ import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.display.EnchantDisplay; +import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; public class PacketSetCreativeSlot extends AbstractPacketAdapter { @@ -19,7 +20,8 @@ public class PacketSetCreativeSlot extends AbstractPacketAdapter { } @Override - public void onReceive(@NotNull final PacketContainer packet) { + public void onReceive(@NotNull final PacketContainer packet, + @NotNull final Player player) { packet.getItemModifier().modify(0, EnchantDisplay::revertDisplay); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java index 7a26d773..df33e665 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java @@ -6,6 +6,7 @@ import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.display.EnchantDisplay; +import org.bukkit.entity.Player; import org.bukkit.inventory.ItemFlag; import org.jetbrains.annotations.NotNull; @@ -20,7 +21,8 @@ public class PacketSetSlot extends AbstractPacketAdapter { } @Override - public void onSend(@NotNull final PacketContainer packet) { + public void onSend(@NotNull final PacketContainer packet, + @NotNull final Player player) { packet.getItemModifier().modify(0, item -> { boolean hideEnchants = false; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java index 3ea00785..e941463a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java @@ -6,6 +6,7 @@ import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.display.EnchantDisplay; +import org.bukkit.entity.Player; import org.bukkit.inventory.ItemFlag; import org.jetbrains.annotations.NotNull; @@ -20,7 +21,8 @@ public class PacketWindowItems extends AbstractPacketAdapter { } @Override - public void onSend(@NotNull final PacketContainer packet) { + public void onSend(@NotNull final PacketContainer packet, + @NotNull final Player player) { packet.getItemListModifier().modify(0, itemStacks -> { if (itemStacks == null) { return null;