From a776b60f86e890cbcbaf7171b45e68064b93f1d5 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Mon, 13 Dec 2021 12:05:49 +0000
Subject: [PATCH] Deprecated AbstractProxy

---
 .../src/main/java/com/willfp/eco/core/EcoPlugin.java |  3 +--
 .../com/willfp/eco/core/proxy/AbstractProxy.java     | 12 +++++-------
 .../java/com/willfp/eco/core/proxy/ProxyFactory.java |  2 +-
 .../com/willfp/eco/internal/proxy/EcoProxyFactory.kt |  7 +++----
 .../eco/internal/spigot/proxy/AutoCraftProxy.kt      |  4 +---
 .../eco/internal/spigot/proxy/BlockBreakProxy.kt     |  3 +--
 .../eco/internal/spigot/proxy/ChatComponentProxy.kt  |  3 +--
 .../spigot/proxy/FastItemStackFactoryProxy.kt        |  3 +--
 .../willfp/eco/internal/spigot/proxy/SkullProxy.kt   |  3 +--
 .../com/willfp/eco/internal/spigot/proxy/TPSProxy.kt |  4 +---
 .../eco/internal/spigot/proxy/VillagerTradeProxy.kt  |  3 +--
 11 files changed, 17 insertions(+), 30 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 3fc55c05..0cc28d04 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
@@ -14,7 +14,6 @@ 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;
@@ -637,7 +636,7 @@ public abstract class EcoPlugin extends JavaPlugin implements PluginLike {
      * @param <T>        The proxy type.
      * @return The proxy.
      */
-    public final <T extends AbstractProxy> T getProxy(@NotNull final Class<T> proxyClass) {
+    public final <T> T getProxy(@NotNull final Class<T> proxyClass) {
         Validate.notNull(proxyFactory, "Plugin does not support proxy!");
 
         return proxyFactory.getProxy(proxyClass);
diff --git a/eco-api/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java b/eco-api/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java
index a59432b7..8bf8af66 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java
@@ -1,14 +1,12 @@
 package com.willfp.eco.core.proxy;
 
 /**
- * All proxies must implement this interface.
- * <p>
- * A proxy is an NMS implementation of a proxy interface.
- * <p>
- * This allows for cross-version support.
- * <p>
- * See the core-spigot and core-nms modules of eco to see an example.
+ * Prior to 6.17.0, all proxies were required to implement this interface,
+ * however it produced no functionality and was not even used internally.
+ *
+ * @deprecated Unused class, not required.
  */
+@Deprecated
 public interface AbstractProxy {
 
 }
diff --git a/eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java b/eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java
index 325546b9..e81cb91d 100644
--- a/eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java
+++ b/eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyFactory.java
@@ -13,5 +13,5 @@ public interface ProxyFactory {
      * @param <T>        The proxy class.
      * @return The proxy implementation.
      */
-    <T extends AbstractProxy> @NotNull T getProxy(@NotNull Class<T> proxyClass);
+    <T> @NotNull T getProxy(@NotNull Class<T> proxyClass);
 }
diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/proxy/EcoProxyFactory.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/proxy/EcoProxyFactory.kt
index 984e0a94..9bb65c0e 100644
--- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/proxy/EcoProxyFactory.kt
+++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/proxy/EcoProxyFactory.kt
@@ -1,7 +1,6 @@
 package com.willfp.eco.internal.proxy
 
 import com.willfp.eco.core.EcoPlugin
-import com.willfp.eco.core.proxy.AbstractProxy
 import com.willfp.eco.core.proxy.ProxyConstants
 import com.willfp.eco.core.proxy.ProxyFactory
 import com.willfp.eco.core.proxy.exceptions.ProxyError
@@ -13,9 +12,9 @@ class EcoProxyFactory(
     private val plugin: EcoPlugin
 ) : ProxyFactory {
     private val proxyClassLoader: ClassLoader = plugin::class.java.classLoader
-    private val cache: MutableMap<Class<out AbstractProxy>, AbstractProxy> = IdentityHashMap()
+    private val cache: MutableMap<Class<out Any>, Any> = IdentityHashMap()
 
-    override fun <T : AbstractProxy> getProxy(proxyClass: Class<T>): T {
+    override fun <T : Any> getProxy(proxyClass: Class<T>): T {
         try {
             val cachedProxy: T? = attemptCache(proxyClass)
             if (cachedProxy != null) {
@@ -53,7 +52,7 @@ class EcoProxyFactory(
         }
     }
 
-    private fun <T : AbstractProxy> attemptCache(proxyClass: Class<T>): T? {
+    private fun <T : Any> attemptCache(proxyClass: Class<T>): T? {
         val proxy = cache[proxyClass] ?: return null
 
         if (proxyClass.isInstance(proxy)) {
diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/AutoCraftProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/AutoCraftProxy.kt
index 6eff274d..5228c3d7 100644
--- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/AutoCraftProxy.kt
+++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/AutoCraftProxy.kt
@@ -1,7 +1,5 @@
 package com.willfp.eco.internal.spigot.proxy
 
-import com.willfp.eco.core.proxy.AbstractProxy
-
-interface AutoCraftProxy : AbstractProxy {
+interface AutoCraftProxy {
     fun modifyPacket(packet: Any)
 }
\ No newline at end of file
diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/BlockBreakProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/BlockBreakProxy.kt
index 173e28f2..b3f6c8a4 100644
--- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/BlockBreakProxy.kt
+++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/BlockBreakProxy.kt
@@ -1,10 +1,9 @@
 package com.willfp.eco.internal.spigot.proxy
 
-import com.willfp.eco.core.proxy.AbstractProxy
 import org.bukkit.block.Block
 import org.bukkit.entity.Player
 
-interface BlockBreakProxy : AbstractProxy {
+interface BlockBreakProxy {
     fun breakBlock(
         player: Player,
         block: Block
diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/ChatComponentProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/ChatComponentProxy.kt
index c8997a6c..45c37ee3 100644
--- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/ChatComponentProxy.kt
+++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/ChatComponentProxy.kt
@@ -1,9 +1,8 @@
 package com.willfp.eco.internal.spigot.proxy
 
-import com.willfp.eco.core.proxy.AbstractProxy
 import org.bukkit.entity.Player
 
-interface ChatComponentProxy : AbstractProxy {
+interface ChatComponentProxy {
     fun modifyComponent(
         obj: Any,
         player: Player
diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/FastItemStackFactoryProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/FastItemStackFactoryProxy.kt
index 7e8a4f23..82723426 100644
--- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/FastItemStackFactoryProxy.kt
+++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/FastItemStackFactoryProxy.kt
@@ -1,9 +1,8 @@
 package com.willfp.eco.internal.spigot.proxy
 
 import com.willfp.eco.core.fast.FastItemStack
-import com.willfp.eco.core.proxy.AbstractProxy
 import org.bukkit.inventory.ItemStack
 
-interface FastItemStackFactoryProxy : AbstractProxy {
+interface FastItemStackFactoryProxy {
     fun create(itemStack: ItemStack): FastItemStack
 }
\ No newline at end of file
diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/SkullProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/SkullProxy.kt
index 6bc8760a..1ee7e939 100644
--- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/SkullProxy.kt
+++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/SkullProxy.kt
@@ -1,9 +1,8 @@
 package com.willfp.eco.internal.spigot.proxy
 
-import com.willfp.eco.core.proxy.AbstractProxy
 import org.bukkit.inventory.meta.SkullMeta
 
-interface SkullProxy : AbstractProxy {
+interface SkullProxy {
     fun setSkullTexture(
         meta: SkullMeta,
         base64: String
diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/TPSProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/TPSProxy.kt
index 09edf58c..e7081b05 100644
--- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/TPSProxy.kt
+++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/TPSProxy.kt
@@ -1,7 +1,5 @@
 package com.willfp.eco.internal.spigot.proxy
 
-import com.willfp.eco.core.proxy.AbstractProxy
-
-interface TPSProxy : AbstractProxy {
+interface TPSProxy {
     fun getTPS(): Double
 }
\ No newline at end of file
diff --git a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/VillagerTradeProxy.kt b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/VillagerTradeProxy.kt
index 49615076..8b23c2ec 100644
--- a/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/VillagerTradeProxy.kt
+++ b/eco-core/core-proxy/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/VillagerTradeProxy.kt
@@ -1,10 +1,9 @@
 package com.willfp.eco.internal.spigot.proxy
 
-import com.willfp.eco.core.proxy.AbstractProxy
 import org.bukkit.entity.Player
 import org.bukkit.inventory.MerchantRecipe
 
-interface VillagerTradeProxy : AbstractProxy {
+interface VillagerTradeProxy {
     fun displayTrade(
         recipe: MerchantRecipe,
         player: Player