start of nms generalization

nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/ExternGuiTester.kt

@@ -5,55 +5,13 @@ import xyz.alexcrea.cuanvil.dependency.util.PlatformUtil
 
 interface ExternGuiTester {
 
-    object Const{
+    fun getContainerClass(view: InventoryView): Class<Any>?
-        val cannonicalPaperAnvilMenu = "net.minecraft.world.inventory.AnvilMenu"
-    }
-
-    val wesjdAnvilGuiName: String?
-
-    fun getContainerClass(inventory: InventoryView): Class<Any>?
 
     fun testIfGui(inventory: InventoryView): Boolean {
-        // this mean we are on test
+        // container class only allow default bukkit craft view class
-        //TODO review why needed knowing previous mitigations should works
-        if(inventory.javaClass.name.endsWith("AnvilViewMock")) return false
 
-        val clazz = getContainerClass(inventory) ?: return false
+        val clazz = getContainerClass(inventory)
-
+        return clazz != null
-        val clazzName = clazz.name
-        if(!PlatformUtil.isPaper){
-            // Blacklist gui causing issue
-            if (expectWesjd(clazzName)) return true
-            if (expectXenondevUI(clazzName)) return true
-            if (expectVanePortal(clazzName)) return true
-
-            return false
-        }
-
-        // Only allow cannonical anvil menu class
-        return !Const.cannonicalPaperAnvilMenu.equals(clazzName, true)
-    }
-
-    fun expectWesjd(name: String): Boolean {
-        val expectedWesjdGuiPath = "anvilgui.version.$wesjdAnvilGuiName"
-
-        return name.contains(expectedWesjdGuiPath)
-    }
-
-    private val XenondevUIPrefix: String
-        get() = "xyz.xenondevs.inventoryaccess."
-    private val XenondevUISufix: String
-        get() = ".AnvilInventoryImpl"
-
-    fun expectXenondevUI(name: String): Boolean {
-        return name.startsWith(XenondevUIPrefix)
-                && name.endsWith(XenondevUISufix)
-    }
-
-    fun expectVanePortal(name: String): Boolean {
-        val expected = "org.oddlama.vane.core.menu.AnvilMenu\$AnvilContainer"
-
-        return name == expected
     }
 
 }

nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_17R1_ExternGuiTester.kt

@@ -1,16 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_17R1_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_17_R1"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if (view !is CraftInventoryView) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-}

nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R1_ExternGuiTester.kt

@@ -1,16 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_18R1_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_18_R1"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if (view !is CraftInventoryView) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-}

nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R2_ExternGuiTester.kt

@@ -1,16 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_18R2_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_18_R2"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if (view !is CraftInventoryView) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-}

nms/v1_19R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R1_ExternGuiTester.kt

@@ -1,16 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_19R1_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_19_R1"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if (view !is CraftInventoryView) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-}

nms/v1_19R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R2_ExternGuiTester.kt

@@ -1,16 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_19R2_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_19_R2"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if (view !is CraftInventoryView) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-}

nms/v1_19R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R3_ExternGuiTester.kt

@@ -1,16 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_19R3_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_19_R3"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if (view !is CraftInventoryView) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-}

nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R1_ExternGuiTester.kt

@@ -1,16 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_20R1_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_20_R1"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if (view !is CraftInventoryView) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-}

nms/v1_20R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R2_ExternGuiTester.kt

@@ -1,17 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-import kotlin.jvm.javaClass
-
-class v1_20R2_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_20_R2"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if (view !is CraftInventoryView) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-}

nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R3_ExternGuiTester.kt

@@ -1,17 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-import kotlin.jvm.javaClass
-
-class v1_20R3_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_20_R3"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if (view !is CraftInventoryView) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-}

nms/v1_20R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R4_ExternGuiTester.kt

@@ -1,17 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-import kotlin.jvm.javaClass
-
-class v1_20R4_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_20_R4"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if (view !is CraftInventoryView) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-}

nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R1_ExternGuiTester.kt

@@ -1,17 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_21R1_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_21_R1"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if(view !is CraftInventoryView<*, *>) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-
-}

nms/v1_21R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R2_ExternGuiTester.kt

@@ -1,34 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_21R2_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_21_R2"
-
-    var tested = false;
-    var possible = false;
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        // In case we are in a test environment
-        if(!tested) testClassExist()
-        if(!possible) return null
-
-        if(view !is CraftInventoryView<*, *>) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-
-    fun testClassExist(){
-        tested = true;
-        try {
-            Class.forName("org.bukkit.craftbukkit.inventory.CraftInventoryView")
-            possible = true
-        } catch (e: ClassNotFoundException){
-            possible = false
-        }
-    }
-
-}

nms/v1_21R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R3_ExternGuiTester.kt

@@ -1,17 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_21R3_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_21_R3"
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        if(view !is CraftInventoryView<*, *>) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-
-}

nms/v1_21R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R4_ExternGuiTester.kt

@@ -1,34 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_21R4_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_21_R4"
-
-    var tested = false;
-    var possible = false;
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        // In case we are in a test environment
-        if(!tested) testClassExist()
-        if(!possible) return null
-
-        if(view !is CraftInventoryView<*, *>) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-
-    fun testClassExist(){
-        tested = true;
-        try {
-            Class.forName("org.bukkit.craftbukkit.inventory.CraftInventoryView")
-            possible = true
-        } catch (e: ClassNotFoundException){
-            possible = false
-        }
-    }
-
-}

nms/v1_21R5/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R5_ExternGuiTester.kt

@@ -1,34 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_21R5_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_21_R5"
-
-    var tested = false;
-    var possible = false;
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        // In case we are in a test environment
-        if(!tested) testClassExist()
-        if(!possible) return null
-
-        if(view !is CraftInventoryView<*, *>) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-
-    fun testClassExist(){
-        tested = true;
-        try {
-            Class.forName("org.bukkit.craftbukkit.inventory.CraftInventoryView")
-            possible = true
-        } catch (e: ClassNotFoundException){
-            possible = false
-        }
-    }
-
-}

nms/v1_21R6/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_21R6_ExternGuiTester.kt

@@ -1,34 +0,0 @@
-package xyz.alexcrea.cuanvil.dependency.gui.version
-
-import org.bukkit.craftbukkit.inventory.CraftInventoryView
-import org.bukkit.inventory.InventoryView
-import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
-
-class v1_21R6_ExternGuiTester: ExternGuiTester {
-    override val wesjdAnvilGuiName = "Wrapper1_21_R6"
-
-    var tested = false;
-    var possible = false;
-
-    override fun getContainerClass(view: InventoryView): Class<Any>? {
-        // In case we are in a test environment
-        if(!tested) testClassExist()
-        if(!possible) return null
-
-        if(view !is CraftInventoryView<*, *>) return null
-        val container = view.handle
-
-        return container.javaClass
-    }
-
-    fun testClassExist(){
-        tested = true;
-        try {
-            Class.forName("org.bukkit.craftbukkit.inventory.CraftInventoryView")
-            possible = true
-        } catch (e: ClassNotFoundException){
-            possible = false
-        }
-    }
-
-}

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GenericExternGuiTester.kt

@@ -0,0 +1,58 @@
+package xyz.alexcrea.cuanvil.dependency.gui
+
+import org.bukkit.inventory.InventoryView
+import xyz.alexcrea.cuanvil.dependency.MinecraftVersionUtil
+import java.lang.reflect.Method
+
+class GenericExternGuiTester: ExternGuiTester {
+
+    companion object {
+        private const val ANVIL_CLASS_NAME = "org.bukkit.craftbukkit.inventory.view.CraftAnvilView"
+        private const val INV_CLASS_NAME = "org.bukkit.craftbukkit.inventory.CraftInventoryView"
+        private const val HANDLE_METHOD_NAME = "getHandle"
+    }
+
+    var tested = false
+
+    var testedClass: String? = null
+    lateinit var getHandleMethod: Method
+
+    override fun getContainerClass(view: InventoryView): Class<Any>? {
+        // In case we are in a test environment
+        if(!tested) testClassExist()
+
+        if(!testedClass.contentEquals(view.javaClass.name))
+            return null
+
+        val container = getHandleMethod.invoke(view)
+        return container.javaClass
+    }
+
+    fun tryFromClass(className: String) {
+        val clazz = Class.forName(className)
+        testedClass = className
+
+        getHandleMethod = clazz.getMethod(HANDLE_METHOD_NAME)
+    }
+
+    fun testClassExist() {
+        tested = true
+
+        // We first try to get craft anvil interface,
+        // but is absent on old version so we try craft inventory view before
+        try {
+            tryFromClass(ANVIL_CLASS_NAME)
+            return
+        }
+        catch (_: ClassNotFoundException) {}
+        catch (_: NoSuchMethodException) {}
+
+        try {
+            tryFromClass(INV_CLASS_NAME)
+            return
+        }
+        catch (_: ClassNotFoundException) {}
+        catch (_: NoSuchMethodException) {}
+    }
+
+}

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt

@@ -1,6 +1,5 @@
 package xyz.alexcrea.cuanvil.dependency.gui
 
-import xyz.alexcrea.cuanvil.dependency.gui.version.*;
 import xyz.alexcrea.cuanvil.update.UpdateUtils
 
 object GuiTesterSelector {
@@ -10,47 +9,7 @@ object GuiTesterSelector {
             val versionParts = UpdateUtils.currentMinecraftVersionArray()
             if (versionParts[0] != 1) return null
 
-            return when (versionParts[1]) {
+            return GenericExternGuiTester()
-                // Can't support 1.16.5 bc 1.16.5 paper userdev do not exist
-
-                17 -> when (versionParts[2]) {
-                    0, 1 -> v1_17R1_ExternGuiTester()
-                    else -> null
-                }
-
-                18 -> when (versionParts[2]) {
-                    0, 1 -> v1_18R1_ExternGuiTester()
-                    2 -> v1_18R2_ExternGuiTester()
-                    else -> null
-                }
-
-                19 -> when (versionParts[2]) {
-                    0, 1, 2 -> v1_19R1_ExternGuiTester()
-                    3 -> v1_19R2_ExternGuiTester()
-                    4 -> v1_19R3_ExternGuiTester()
-                    else -> null
-                }
-
-                20 -> when (versionParts[2]) {
-                    0, 1 -> v1_20R1_ExternGuiTester()
-                    2 -> v1_20R2_ExternGuiTester()
-                    3, 4 -> v1_20R3_ExternGuiTester()
-                    5, 6 -> v1_20R4_ExternGuiTester()
-                    else -> null
-                }
-
-                21 -> when (versionParts[2]) {
-                    0, 1 -> v1_21R1_ExternGuiTester()
-                    2, 3 -> v1_21R2_ExternGuiTester()
-                    4 -> v1_21R3_ExternGuiTester()
-                    5 -> v1_21R4_ExternGuiTester()
-                    6, 7, 8 -> v1_21R5_ExternGuiTester()
-                    9, 10 -> v1_21R6_ExternGuiTester()
-                    else -> null
-                }
-
-                else -> null
-            }
         }
 
 }