build: 在 Velocity 中引入 relocate 后的 netty，防止依赖版本冲突

README.md

@@ -24,9 +24,9 @@ repositories {
 
 dependencies {
     // 对于 Bukkit 插件
-    compileOnly("cn.hamster3.mc.plugin:core-bukkit:1.4.0")
+    compileOnly("cn.hamster3.mc.plugin:core-bukkit:1.4.1")
     // 对于 BungeeCord 插件
-    compileOnly("cn.hamster3.mc.plugin:core-bungee:1.4.0")
+    compileOnly("cn.hamster3.mc.plugin:core-bungee:1.4.1")
 }
 ```
 
@@ -52,13 +52,13 @@ dependencies {
         <dependency>
             <groupId>cn.hamster3.mc.plugin</groupId>
             <artifactId>core-bukkit</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
         </dependency>
         <!--对于 BungeeCord 插件-->
         <dependency>
             <groupId>cn.hamster3.mc.plugin</groupId>
             <artifactId>core-bungee</artifactId>
-            <version>1.4.0</version>
+            <version>1.4.1</version>
         </dependency>
     </dependencies>
 </project>

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "cn.hamster3.mc.plugin"
-version = "1.4.0"
+version = "1.4.1"
 description = "叁只仓鼠的 Minecraft 插件开发通用工具包"
 
 subprojects {

core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java

@@ -130,6 +130,8 @@ public class HamsterCorePlugin extends JavaPlugin {
     @Override
     public void onDisable() {
         long start = System.currentTimeMillis();
+        audienceProvider.close();
+        simpleLogger.info("已关闭 AudienceProvider.");
         if (CoreAPI.getInstance().isEnableRedis()) {
             CoreAPI.getInstance().getJedisPool().close();
             CoreAPI.getInstance().getRedisClient().close();

core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/nbt/NBTCommand.java

@@ -4,7 +4,8 @@ import cn.hamster3.mc.plugin.core.bukkit.HamsterCorePlugin;
 import cn.hamster3.mc.plugin.core.bukkit.command.ParentCommand;
 import cn.hamster3.mc.plugin.core.bukkit.constant.CoreMessage;
 import cn.hamster3.mc.plugin.core.bukkit.util.CoreBukkitUtils;
-import de.tr7zw.changeme.nbtapi.*;
+import de.tr7zw.changeme.nbtapi.NBT;
+import de.tr7zw.changeme.nbtapi.NBTType;
 import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBT;
 import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBTCompoundList;
 import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBTList;

core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java

@@ -70,6 +70,8 @@ public class HamsterCorePlugin extends Plugin {
     @Override
     public void onDisable() {
         long start = System.currentTimeMillis();
+        audienceProvider.close();
+        simpleLogger.info("已关闭 AudienceProvider.");
         if (CoreAPI.getInstance().isEnableRedis()) {
             CoreAPI.getInstance().getJedisPool().close();
             CoreAPI.getInstance().getRedisClient().close();

core-velocity/build.gradle.kts

@@ -1,6 +1,9 @@
 @file:Suppress("VulnerableLibrariesLocal")
 
 evaluationDependsOn(":core-common")
+evaluationDependsOn(":core-relocate-lettuce")
+
+val shade = configurations.create("shade")
 
 dependencies {
     api(project(":core-common")) { isTransitive = false }
@@ -14,10 +17,11 @@ dependencies {
         exclude(group = "com.google.code.gson")
         exclude(group = "org.slf4j")
     }
-    api("io.lettuce:lettuce-core:6.7.1.RELEASE") {
-        exclude(group = "io.netty")
+    compileOnlyApi("io.lettuce:lettuce-core:6.7.1.RELEASE") {
         exclude(group = "org.slf4j")
+        exclude(group = "io.netty")
     }
+    shade(project(":core-relocate-lettuce"))
 
     // https://mvnrepository.com/artifact/com.mysql/mysql-connector-j
     runtimeOnly("com.mysql:mysql-connector-j:8.4.0")
@@ -50,6 +54,13 @@ tasks {
         archiveBaseName = "HamsterCore-Velocity"
     }
     shadowJar {
+        dependsOn(":core-relocate-lettuce:shadowJar")
+        val task = project(":core-relocate-lettuce").tasks.shadowJar.get()
+        from(task.outputs.files.map {
+            if (it.isDirectory) it else zipTree(
+                it
+            )
+        })
         destinationDirectory = rootProject.layout.buildDirectory
     }
 }

core-velocity/src/main/java/cn/hamster3/mc/plugin/core/velocity/HamsterCorePlugin.java

@@ -4,6 +4,7 @@ import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
 import cn.hamster3.mc.plugin.core.common.config.YamlConfig;
 import cn.hamster3.mc.plugin.core.common.util.UpdateCheckUtils;
 import cn.hamster3.mc.plugin.core.velocity.api.CoreVelocityAPI;
+import cn.hamster3.mc.plugin.core.velocity.impl.AudienceProviderImpl;
 import cn.hamster3.mc.plugin.core.velocity.util.VelocitySimpleLogger;
 import com.google.inject.Inject;
 import com.velocitypowered.api.event.PostOrder;
@@ -83,6 +84,8 @@ public class HamsterCorePlugin {
     @Subscribe(order = PostOrder.LAST)
     public void onProxyShutdown(ProxyShutdownEvent event) {
         long start = System.currentTimeMillis();
+        AudienceProviderImpl.INSTANCE.close();
+        simpleLogger.info("已关闭 AudienceProvider.");
         if (CoreAPI.getInstance().isEnableRedis()) {
             CoreAPI.getInstance().getJedisPool().close();
             CoreAPI.getInstance().getRedisClient().close();