diff --git a/build.gradle b/build.gradle index fe14659..0505382 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { dependencies { implementation project(":eco-core").getSubprojects() - implementation 'com.willfp:eco:1.0.6' + implementation 'com.willfp:eco:1.1.0' } allprojects { diff --git a/eco-core/build.gradle b/eco-core/build.gradle index 428e16a..43b590b 100644 --- a/eco-core/build.gradle +++ b/eco-core/build.gradle @@ -3,6 +3,6 @@ version rootProject.version subprojects { dependencies { - compileOnly 'com.willfp:eco:1.0.6' + compileOnly 'com.willfp:eco:1.1.0' } } \ No newline at end of file diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketAutoRecipe.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketAutoRecipe.java index 52ab32e..fc1649e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketAutoRecipe.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketAutoRecipe.java @@ -7,7 +7,7 @@ import com.willfp.eco.util.ProxyUtils; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.talismans.proxy.proxies.AutoCraftProxy; -import org.bukkit.Bukkit; +import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import java.lang.reflect.InvocationTargetException; @@ -23,7 +23,8 @@ public class PacketAutoRecipe extends AbstractPacketAdapter { } @Override - public void onSend(@NotNull final PacketContainer packet) { + public void onSend(@NotNull final PacketContainer packet, + @NotNull final Player player) { if (!packet.getMinecraftKeys().getValues().get(0).getFullKey().split(":")[0].equals("talismans")) { return; } @@ -42,7 +43,7 @@ public class PacketAutoRecipe extends AbstractPacketAdapter { newAutoRecipe.getMinecraftKeys().write(0, packet.getMinecraftKeys().read(0)); try { - ProtocolLibrary.getProtocolManager().sendServerPacket(Bukkit.getServer().getPlayer("Auxilor"), newAutoRecipe); + ProtocolLibrary.getProtocolManager().sendServerPacket(player, newAutoRecipe); } catch (InvocationTargetException e) { e.printStackTrace(); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketChat.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketChat.java index 8ee23e4..90af977 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketChat.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/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.talismans.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.talismans.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/talismans/display/packets/PacketOpenWindowMerchant.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketOpenWindowMerchant.java index c6bcebe..a182b17 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketOpenWindowMerchant.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketOpenWindowMerchant.java @@ -7,6 +7,7 @@ import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.talismans.proxy.proxies.VillagerTradeProxy; import org.bukkit.Material; +import org.bukkit.entity.Player; import org.bukkit.inventory.MerchantRecipe; import org.jetbrains.annotations.NotNull; @@ -24,7 +25,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/talismans/display/packets/PacketSetCreativeSlot.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketSetCreativeSlot.java index 29f77fe..44374a0 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketSetCreativeSlot.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketSetCreativeSlot.java @@ -5,6 +5,7 @@ import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.talismans.display.TalismanDisplay; +import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; public class PacketSetCreativeSlot extends AbstractPacketAdapter { @@ -18,7 +19,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, TalismanDisplay::revertDisplay); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketSetSlot.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketSetSlot.java index 3891ae2..ecae686 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketSetSlot.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketSetSlot.java @@ -5,6 +5,7 @@ import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.talismans.display.TalismanDisplay; +import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; public class PacketSetSlot extends AbstractPacketAdapter { @@ -18,7 +19,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, TalismanDisplay::displayTalisman); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketWindowItems.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketWindowItems.java index 8e2bf5c..1e73830 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketWindowItems.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/packets/PacketWindowItems.java @@ -5,6 +5,7 @@ import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import com.willfp.talismans.display.TalismanDisplay; +import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; public class PacketWindowItems extends AbstractPacketAdapter { @@ -18,7 +19,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;