From 39b95c7a3411a9f84ae83a285939ee174161e598 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 16 Jul 2021 18:25:10 +0200 Subject: [PATCH] Changed EcoPlugin#getProxyFactory#getProxy to EcoPlugin#getProxy --- .../src/main/java/com/willfp/eco/core/EcoPlugin.java | 11 +++++++---- .../java/com/willfp/eco/spigot/EcoSpigotPlugin.java | 6 +++--- .../willfp/eco/spigot/display/PacketAutoRecipe.java | 2 +- .../com/willfp/eco/spigot/display/PacketChat.java | 2 +- .../eco/spigot/display/PacketOpenWindowMerchant.java | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java b/eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java index f683737e..3e865701 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java +++ b/eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java @@ -13,6 +13,7 @@ import com.willfp.eco.core.factory.NamespacedKeyFactory; import com.willfp.eco.core.factory.RunnableFactory; import com.willfp.eco.core.integrations.IntegrationLoader; import com.willfp.eco.core.integrations.placeholder.PlaceholderManager; +import com.willfp.eco.core.proxy.AbstractProxy; import com.willfp.eco.core.proxy.ProxyFactory; import com.willfp.eco.core.scheduling.Scheduler; import com.willfp.eco.core.web.UpdateChecker; @@ -587,14 +588,16 @@ public abstract class EcoPlugin extends JavaPlugin { } /** - * Get the proxy factory. + * Get a proxy. * - * @return The proxy factory. + * @param proxyClass The proxy class. + * @param The proxy type. + * @return The proxy. */ - public ProxyFactory getProxyFactory() { + public T getProxy(@NotNull final Class proxyClass) { Validate.notNull(proxyFactory, "Plugin does not support proxy!"); - return proxyFactory; + return proxyFactory.getProxy(proxyClass); } /** diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java index bb15d5bb..7e466fce 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoSpigotPlugin.java @@ -68,13 +68,13 @@ public abstract class EcoSpigotPlugin extends EcoPlugin { instance = this; Display.setFinalizeKey(this.getNamespacedKeyFactory().create("finalized")); - SkullProxy skullProxy = this.getProxyFactory().getProxy(SkullProxy.class); + SkullProxy skullProxy = this.getProxy(SkullProxy.class); SkullUtils.initialize(skullProxy::setSkullTexture); - BlockBreakProxy blockBreakProxy = this.getProxyFactory().getProxy(BlockBreakProxy.class); + BlockBreakProxy blockBreakProxy = this.getProxy(BlockBreakProxy.class); BlockUtils.initialize(blockBreakProxy::breakBlock); - TridentStackProxy tridentStackProxy = this.getProxyFactory().getProxy(TridentStackProxy.class); + TridentStackProxy tridentStackProxy = this.getProxy(TridentStackProxy.class); TridentUtils.initialize(tridentStackProxy::getTridentStack); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java index 46c1852b..4a7ddc88 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java @@ -33,7 +33,7 @@ public class PacketAutoRecipe extends AbstractPacketAdapter { } try { - this.getPlugin().getProxyFactory().getProxy(AutoCraftProxy.class).modifyPacket(packet.getHandle()); + this.getPlugin().getProxy(AutoCraftProxy.class).modifyPacket(packet.getHandle()); } catch (NoSuchFieldException | IllegalAccessException e) { e.printStackTrace(); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketChat.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketChat.java index 6d99be40..8d02fc08 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketChat.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketChat.java @@ -33,7 +33,7 @@ public class PacketChat extends AbstractPacketAdapter { return; } - WrappedChatComponent newComponent = WrappedChatComponent.fromHandle(this.getPlugin().getProxyFactory().getProxy(ChatComponentProxy.class).modifyComponent(component.getHandle())); + WrappedChatComponent newComponent = WrappedChatComponent.fromHandle(this.getPlugin().getProxy(ChatComponentProxy.class).modifyComponent(component.getHandle())); packet.getChatComponents().write(i, newComponent); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java index 3b43d85a..c0bb80e3 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java @@ -52,7 +52,7 @@ public class PacketOpenWindowMerchant extends AbstractPacketAdapter { } for (MerchantRecipe recipe : packet.getMerchantRecipeLists().read(0)) { - MerchantRecipe newRecipe = this.getPlugin().getProxyFactory().getProxy(VillagerTradeProxy.class).displayTrade(recipe); + MerchantRecipe newRecipe = this.getPlugin().getProxy(VillagerTradeProxy.class).displayTrade(recipe); recipes.add(newRecipe); }