diff --git a/build.gradle.kts b/build.gradle.kts index 34062c8..571dc74 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,15 +50,15 @@ subprojects { } shadowJar { archiveClassifier = "" - relocate("io.netty", "cn.hamster3.mc.plugin.core.lib.io.netty") relocate("io.lettuce", "cn.hamster3.mc.plugin.core.lib.io.lettuce") relocate("reactor", "cn.hamster3.mc.plugin.core.lib.reactor") relocate("org.reactivestreams", "cn.hamster3.mc.plugin.core.lib.org.reactivestreams") relocate("org.quartz", "cn.hamster3.mc.plugin.core.lib.org.quartz") relocate("org.terracotta.quartz", "cn.hamster3.mc.plugin.core.lib.org.terracotta.quartz") - relocate("net.kyori", "cn.hamster3.mc.plugin.core.lib.net.kyori") relocate("com.zaxxer.hikari", "cn.hamster3.mc.plugin.core.lib.com.zaxxer.hikari") + + relocate("net.kyori", "cn.hamster3.mc.plugin.core.lib.net.kyori") relocate("de.tr7zw.changeme.nbtapi", "cn.hamster3.mc.plugin.core.lib.de.tr7zw.nbtapi") relocate("de.tr7zw.annotations", "cn.hamster3.mc.plugin.core.lib.de.tr7zw.nbtapi.annotations") } diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts index bd9cf00..0673020 100644 --- a/core-bukkit/build.gradle.kts +++ b/core-bukkit/build.gradle.kts @@ -29,7 +29,9 @@ dependencies { exclude(group = "org.slf4j") } // https://mvnrepository.com/artifact/io.lettuce/lettuce-core - implementation("io.lettuce:lettuce-core:6.3.1.RELEASE") + implementation("io.lettuce:lettuce-core:6.3.1.RELEASE") { + exclude(group = "io.netty") + } implementation("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java index c187758..dc2a11b 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java @@ -5,8 +5,8 @@ import cn.hamster3.mc.plugin.core.bukkit.util.serializer.ItemStackAdapter; import cn.hamster3.mc.plugin.core.bukkit.util.serializer.PotionEffectAdapter; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; -import cn.hamster3.mc.plugin.core.common.util.serializer.ComponentTypeAdapter; -import cn.hamster3.mc.plugin.core.common.util.serializer.MessageTypeAdapter; +import cn.hamster3.mc.plugin.core.common.serializer.ComponentTypeAdapter; +import cn.hamster3.mc.plugin.core.common.serializer.MessageTypeAdapter; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.zaxxer.hikari.HikariConfig; diff --git a/core-bungee/build.gradle.kts b/core-bungee/build.gradle.kts index 7815d27..deb41ae 100644 --- a/core-bungee/build.gradle.kts +++ b/core-bungee/build.gradle.kts @@ -21,7 +21,9 @@ dependencies { exclude(group = "org.slf4j") } // https://mvnrepository.com/artifact/io.lettuce/lettuce-core - implementation("io.lettuce:lettuce-core:6.3.1.RELEASE") + implementation("io.lettuce:lettuce-core:6.3.1.RELEASE") { + exclude(group = "io.netty") + } implementation("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } diff --git a/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java b/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java index fbf4794..de25942 100644 --- a/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java +++ b/core-bungee/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java @@ -4,8 +4,8 @@ import cn.hamster3.mc.plugin.core.bungee.HamsterCorePlugin; import cn.hamster3.mc.plugin.core.bungee.util.CoreBungeeCordUtils; import cn.hamster3.mc.plugin.core.common.api.CoreAPI; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; -import cn.hamster3.mc.plugin.core.common.util.serializer.ComponentTypeAdapter; -import cn.hamster3.mc.plugin.core.common.util.serializer.MessageTypeAdapter; +import cn.hamster3.mc.plugin.core.common.serializer.ComponentTypeAdapter; +import cn.hamster3.mc.plugin.core.common.serializer.MessageTypeAdapter; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.zaxxer.hikari.HikariConfig; diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/ComponentTypeAdapter.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/serializer/ComponentTypeAdapter.java similarity index 93% rename from core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/ComponentTypeAdapter.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/serializer/ComponentTypeAdapter.java index 1189713..ffa2a11 100644 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/ComponentTypeAdapter.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/serializer/ComponentTypeAdapter.java @@ -1,4 +1,4 @@ -package cn.hamster3.mc.plugin.core.common.util.serializer; +package cn.hamster3.mc.plugin.core.common.serializer; import com.google.gson.*; import net.kyori.adventure.text.Component; diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/MessageTypeAdapter.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/serializer/MessageTypeAdapter.java similarity index 92% rename from core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/MessageTypeAdapter.java rename to core-common/src/main/java/cn/hamster3/mc/plugin/core/common/serializer/MessageTypeAdapter.java index 328627c..f4e4444 100644 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/serializer/MessageTypeAdapter.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/serializer/MessageTypeAdapter.java @@ -1,4 +1,4 @@ -package cn.hamster3.mc.plugin.core.common.util.serializer; +package cn.hamster3.mc.plugin.core.common.serializer; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; import com.google.gson.*;