From d82bd9b22c24861dbf78e1dc093ca61840483b47 Mon Sep 17 00:00:00 2001
From: alexcrea <contact@alexcrea.xyz>
Date: Wed, 10 Jun 2026 17:07:52 +0200
Subject: [PATCH] do not packet manager on test

---
 .../cuanvil/dependency/DependencyManager.kt       |  8 +++-----
 .../dependency/gui/GenericExternGuiTester.kt      |  8 ++++++--
 .../cuanvil/dependency/gui/GuiTesterSelector.kt   | 15 ---------------
 .../dependency/packet/PacketManagerSelector.kt    |  4 ++++
 4 files changed, 13 insertions(+), 22 deletions(-)
 delete mode 100644 src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt

diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
index cb24eaa..b730a0e 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
@@ -23,7 +23,6 @@ import xyz.alexcrea.cuanvil.api.event.listener.CATreatAnvilResult2Event
 import xyz.alexcrea.cuanvil.config.ConfigHolder
 import xyz.alexcrea.cuanvil.dependency.datapack.DataPackDependency
 import xyz.alexcrea.cuanvil.dependency.gui.GenericExternGuiTester
-import xyz.alexcrea.cuanvil.dependency.gui.GuiTesterSelector
 import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
 import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerSelector
 import xyz.alexcrea.cuanvil.dependency.plugins.*
@@ -40,7 +39,7 @@ object DependencyManager {
 
     lateinit var scheduler: TaskScheduler
     lateinit var packetManager: PacketManager
-    var externGuiTester: GenericExternGuiTester? = null
+    var externGuiTester: GenericExternGuiTester = GenericExternGuiTester()
 
     var enchantmentSquaredCompatibility: EnchantmentSquaredDependency? = null
     var ecoEnchantCompatibility: EcoEnchantDependency? = null
@@ -68,7 +67,6 @@ object DependencyManager {
         // Packet Manager
         val forceProtocolib = ConfigHolder.DEFAULT_CONFIG.config.getBoolean("force_protocolib", false)
         packetManager = PacketManagerSelector.selectPacketManager(forceProtocolib)
-        externGuiTester = GuiTesterSelector.selectGuiTester
 
         // Enchantment Squared dependency
         if (pluginManager.isPluginEnabled("EnchantsSquared")) {
@@ -192,7 +190,7 @@ object DependencyManager {
         var bypass = bypassEvent.isCancelled
 
         // Test if the inventory is a gui(version specific)
-        if (!bypass && (externGuiTester?.testIfGui(event.view) == true)) bypass = true
+        if (!bypass && externGuiTester.testIfGui(event.view)) bypass = true
 
         // Test if in an ax player warp rating gui
         if (!bypass && (axPlayerWarpsCompatibility?.testIfGui(player) == true)) bypass = true
@@ -289,7 +287,7 @@ object DependencyManager {
         }
 
         // Test if the inventory is a gui(version specific)
-        if (!bypass && (externGuiTester?.testIfGui(event.view) == true)) bypass = true
+        if (!bypass && externGuiTester.testIfGui(event.view)) bypass = true
 
         // Test if in an ax player warp rating gui
         if (!bypass && (axPlayerWarpsCompatibility?.testIfGui(event.view.player) == true)) bypass = true
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GenericExternGuiTester.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GenericExternGuiTester.kt
index 0e430ef..4046f4a 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GenericExternGuiTester.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GenericExternGuiTester.kt
@@ -36,6 +36,11 @@ class GenericExternGuiTester {
         getHandleMethod = clazz.getMethod(HANDLE_METHOD_NAME)
     }
 
+    fun isInTest(): Boolean {
+        if(!testExist) testClassExist()
+        return inTesting
+    }
+
     fun testClassExist() {
         testExist = true
 
@@ -61,8 +66,7 @@ class GenericExternGuiTester {
     // Try if were in another plugin anvil inventory
     fun testIfGui(inventory: InventoryView): Boolean {
         // In case we are in a test environment
-        if(!testExist) testClassExist()
-        if(inTesting) return false
+        if(isInTest()) return false
 
         val clazz = getContainerClass(inventory) ?: return false
 
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt
deleted file mode 100644
index e445d8d..0000000
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui
-
-import xyz.alexcrea.cuanvil.update.UpdateUtils
-
-object GuiTesterSelector {
-
-    val selectGuiTester: GenericExternGuiTester?
-        get() {
-            val versionParts = UpdateUtils.currentMinecraftVersionArray()
-            if (versionParts[0] != 1) return null
-
-            return GenericExternGuiTester()
-        }
-
-}
\ No newline at end of file
diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt
index 4c3d680..6c18a75 100644
--- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt
+++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt
@@ -1,6 +1,7 @@
 package xyz.alexcrea.cuanvil.dependency.packet
 
 import org.bukkit.Bukkit
+import xyz.alexcrea.cuanvil.dependency.DependencyManager
 import xyz.alexcrea.cuanvil.dependency.MinecraftVersionUtil
 import xyz.alexcrea.cuanvil.dependency.packet.versions.*
 import xyz.alexcrea.cuanvil.update.UpdateUtils
@@ -11,6 +12,9 @@ object PacketManagerSelector {
 
     fun selectPacketManager(forceProtocolib: Boolean): PacketManager {
         // Try to find version
+        if(DependencyManager.externGuiTester.isInTest())
+            return NoPacketManager()
+
         return if (forceProtocolib)
             protocolibIfPresent
         else {