From 52a58acd28b64cffc5e1cd796d1a419dc434bc89 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Sat, 11 Jul 2026 13:56:29 +0200 Subject: [PATCH] fix test issue --- .../dependency/util/{PaperSpigotUtil.kt => PlatformUtil.kt} | 0 src/main/kotlin/io/delilaheve/CustomAnvil.kt | 3 ++- .../xyz/alexcrea/cuanvil/dependency/DependencyManager.kt | 2 ++ .../cuanvil/dependency/packet/PacketManagerSelector.kt | 2 +- src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) rename nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/{PaperSpigotUtil.kt => PlatformUtil.kt} (100%) diff --git a/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PaperSpigotUtil.kt b/nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PlatformUtil.kt similarity index 100% rename from nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PaperSpigotUtil.kt rename to nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/util/PlatformUtil.kt diff --git a/src/main/kotlin/io/delilaheve/CustomAnvil.kt b/src/main/kotlin/io/delilaheve/CustomAnvil.kt index 75f56249..66d812b9 100644 --- a/src/main/kotlin/io/delilaheve/CustomAnvil.kt +++ b/src/main/kotlin/io/delilaheve/CustomAnvil.kt @@ -204,7 +204,8 @@ open class CustomAnvil : JavaPlugin() { private fun legacyCheck() { val currentVersion = UpdateUtils.currentMinecraftVersion() - if (currentVersion.greaterEqual(Version(1, 21, 0))) { + if (currentVersion.greaterEqual(Version(1, 21, 0)) + && !DependencyManager.inTesting) { logger.warning("You are running a Minecraft version above or equal to 1.21.0") logger.warning("Please use CustomAnvil v2 instead if you wish to use the plugin with this version.") Bukkit.getPluginManager().disablePlugin(this) diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt index 3d5b8e86..b52bd167 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt @@ -42,6 +42,8 @@ object DependencyManager { lateinit var packetManager: PacketManager var externGuiTester: GenericExternGuiTester = GenericExternGuiTester() + val inTesting = externGuiTester.isInTest() + var enchantmentSquaredCompatibility: EnchantmentSquaredDependency? = null var ecoEnchantCompatibility: EcoEnchantDependency? = null var excellentEnchantsCompatibility: ExcellentEnchantsDependency? = null 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 d74ef089..69ca28cc 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt @@ -12,7 +12,7 @@ object PacketManagerSelector { fun selectPacketManager(forceProtocolib: Boolean): PacketManager { // Try to find version - if(DependencyManager.externGuiTester.isInTest()) + if(DependencyManager.inTesting) return NoPacketManager() return if (forceProtocolib) diff --git a/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt index 1763db56..9459ad9e 100644 --- a/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt +++ b/src/main/kotlin/xyz/alexcrea/cuanvil/util/MetricsUtil.kt @@ -18,7 +18,7 @@ object MetricsUtil { private var FAST_STATS_METRICS: BukkitContext? = null fun loadMetrics(plugin: CustomAnvil) { - if(DependencyManager.externGuiTester.isInTest()) return + if(DependencyManager.inTesting) return val config = ConfigHolder.DEFAULT_CONFIG.config val metricString = config.getString(ConfigOptions.METRIC_TYPE, MetricType.AUTO.value)!!