mirror of
https://github.com/alexcrea/CustomAnvil.git
synced 2026-06-23 08:14:00 +02:00
do not packet manager on test
This commit is contained in:
parent
380b0de92f
commit
d82bd9b22c
4 changed files with 13 additions and 22 deletions
|
|
@ -23,7 +23,6 @@ import xyz.alexcrea.cuanvil.api.event.listener.CATreatAnvilResult2Event
|
||||||
import xyz.alexcrea.cuanvil.config.ConfigHolder
|
import xyz.alexcrea.cuanvil.config.ConfigHolder
|
||||||
import xyz.alexcrea.cuanvil.dependency.datapack.DataPackDependency
|
import xyz.alexcrea.cuanvil.dependency.datapack.DataPackDependency
|
||||||
import xyz.alexcrea.cuanvil.dependency.gui.GenericExternGuiTester
|
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.PacketManager
|
||||||
import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerSelector
|
import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerSelector
|
||||||
import xyz.alexcrea.cuanvil.dependency.plugins.*
|
import xyz.alexcrea.cuanvil.dependency.plugins.*
|
||||||
|
|
@ -40,7 +39,7 @@ object DependencyManager {
|
||||||
|
|
||||||
lateinit var scheduler: TaskScheduler
|
lateinit var scheduler: TaskScheduler
|
||||||
lateinit var packetManager: PacketManager
|
lateinit var packetManager: PacketManager
|
||||||
var externGuiTester: GenericExternGuiTester? = null
|
var externGuiTester: GenericExternGuiTester = GenericExternGuiTester()
|
||||||
|
|
||||||
var enchantmentSquaredCompatibility: EnchantmentSquaredDependency? = null
|
var enchantmentSquaredCompatibility: EnchantmentSquaredDependency? = null
|
||||||
var ecoEnchantCompatibility: EcoEnchantDependency? = null
|
var ecoEnchantCompatibility: EcoEnchantDependency? = null
|
||||||
|
|
@ -68,7 +67,6 @@ object DependencyManager {
|
||||||
// Packet Manager
|
// Packet Manager
|
||||||
val forceProtocolib = ConfigHolder.DEFAULT_CONFIG.config.getBoolean("force_protocolib", false)
|
val forceProtocolib = ConfigHolder.DEFAULT_CONFIG.config.getBoolean("force_protocolib", false)
|
||||||
packetManager = PacketManagerSelector.selectPacketManager(forceProtocolib)
|
packetManager = PacketManagerSelector.selectPacketManager(forceProtocolib)
|
||||||
externGuiTester = GuiTesterSelector.selectGuiTester
|
|
||||||
|
|
||||||
// Enchantment Squared dependency
|
// Enchantment Squared dependency
|
||||||
if (pluginManager.isPluginEnabled("EnchantsSquared")) {
|
if (pluginManager.isPluginEnabled("EnchantsSquared")) {
|
||||||
|
|
@ -192,7 +190,7 @@ object DependencyManager {
|
||||||
var bypass = bypassEvent.isCancelled
|
var bypass = bypassEvent.isCancelled
|
||||||
|
|
||||||
// Test if the inventory is a gui(version specific)
|
// 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
|
// Test if in an ax player warp rating gui
|
||||||
if (!bypass && (axPlayerWarpsCompatibility?.testIfGui(player) == true)) bypass = true
|
if (!bypass && (axPlayerWarpsCompatibility?.testIfGui(player) == true)) bypass = true
|
||||||
|
|
@ -289,7 +287,7 @@ object DependencyManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test if the inventory is a gui(version specific)
|
// 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
|
// Test if in an ax player warp rating gui
|
||||||
if (!bypass && (axPlayerWarpsCompatibility?.testIfGui(event.view.player) == true)) bypass = true
|
if (!bypass && (axPlayerWarpsCompatibility?.testIfGui(event.view.player) == true)) bypass = true
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,11 @@ class GenericExternGuiTester {
|
||||||
getHandleMethod = clazz.getMethod(HANDLE_METHOD_NAME)
|
getHandleMethod = clazz.getMethod(HANDLE_METHOD_NAME)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun isInTest(): Boolean {
|
||||||
|
if(!testExist) testClassExist()
|
||||||
|
return inTesting
|
||||||
|
}
|
||||||
|
|
||||||
fun testClassExist() {
|
fun testClassExist() {
|
||||||
testExist = true
|
testExist = true
|
||||||
|
|
||||||
|
|
@ -61,8 +66,7 @@ class GenericExternGuiTester {
|
||||||
// Try if were in another plugin anvil inventory
|
// Try if were in another plugin anvil inventory
|
||||||
fun testIfGui(inventory: InventoryView): Boolean {
|
fun testIfGui(inventory: InventoryView): Boolean {
|
||||||
// In case we are in a test environment
|
// In case we are in a test environment
|
||||||
if(!testExist) testClassExist()
|
if(isInTest()) return false
|
||||||
if(inTesting) return false
|
|
||||||
|
|
||||||
val clazz = getContainerClass(inventory) ?: return false
|
val clazz = getContainerClass(inventory) ?: return false
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package xyz.alexcrea.cuanvil.dependency.packet
|
package xyz.alexcrea.cuanvil.dependency.packet
|
||||||
|
|
||||||
import org.bukkit.Bukkit
|
import org.bukkit.Bukkit
|
||||||
|
import xyz.alexcrea.cuanvil.dependency.DependencyManager
|
||||||
import xyz.alexcrea.cuanvil.dependency.MinecraftVersionUtil
|
import xyz.alexcrea.cuanvil.dependency.MinecraftVersionUtil
|
||||||
import xyz.alexcrea.cuanvil.dependency.packet.versions.*
|
import xyz.alexcrea.cuanvil.dependency.packet.versions.*
|
||||||
import xyz.alexcrea.cuanvil.update.UpdateUtils
|
import xyz.alexcrea.cuanvil.update.UpdateUtils
|
||||||
|
|
@ -11,6 +12,9 @@ object PacketManagerSelector {
|
||||||
|
|
||||||
fun selectPacketManager(forceProtocolib: Boolean): PacketManager {
|
fun selectPacketManager(forceProtocolib: Boolean): PacketManager {
|
||||||
// Try to find version
|
// Try to find version
|
||||||
|
if(DependencyManager.externGuiTester.isInTest())
|
||||||
|
return NoPacketManager()
|
||||||
|
|
||||||
return if (forceProtocolib)
|
return if (forceProtocolib)
|
||||||
protocolibIfPresent
|
protocolibIfPresent
|
||||||
else {
|
else {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue