diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/SerializeUtils.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitSerializeUtils.java similarity index 97% rename from hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/SerializeUtils.java rename to hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitSerializeUtils.java index 950518e..377ccc9 100644 --- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/SerializeUtils.java +++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitSerializeUtils.java @@ -15,8 +15,8 @@ import java.io.IOException; import java.util.logging.Level; @SuppressWarnings("unused") -public final class SerializeUtils { - private SerializeUtils() { +public final class BukkitSerializeUtils { + private BukkitSerializeUtils() { } @Nullable diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java index 20f7ef6..d4196f2 100644 --- a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java +++ b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java @@ -1,6 +1,5 @@ package cn.hamster3.mc.plugin.core.common.data; -import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects; import cn.hamster3.mc.plugin.core.common.util.SerializeUtils; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -295,6 +294,6 @@ public class DisplayMessage { @Override public String toString() { - return CoreConstantObjects.GSON.toJson(this); + return saveToJson().toString(); } } diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CommonUtils.java b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CommonUtils.java index 2625a11..9f85f96 100644 --- a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CommonUtils.java +++ b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CommonUtils.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.nio.file.Files; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -64,10 +65,7 @@ public final class CommonUtils { */ @NotNull public static String replaceColorCode(@Nullable String string, @NotNull String defaultValue) { - if (string == null) { - return replaceColorCode(defaultValue); - } - return replaceColorCode(string); + return replaceColorCode(Objects.requireNonNullElse(string, defaultValue)); } /** diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/SerializeUtils.java b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/SerializeUtils.java index e84da98..e78588b 100644 --- a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/SerializeUtils.java +++ b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/SerializeUtils.java @@ -1,10 +1,8 @@ package cn.hamster3.mc.plugin.core.common.util; -import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects; import com.google.gson.JsonObject; import net.kyori.adventure.key.Key; import net.kyori.adventure.sound.Sound; -import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.title.Title; import org.jetbrains.annotations.NotNull; @@ -46,8 +44,8 @@ public final class SerializeUtils { public static Title deserializeTitle(@NotNull JsonObject object) { if (object.has("times")) { return Title.title( - CoreConstantObjects.GSON.fromJson(object.get("title"), Component.class), - CoreConstantObjects.GSON.fromJson(object.get("subtitle"), Component.class), + GsonComponentSerializer.gson().deserializeFromTree(object.get("title")), + GsonComponentSerializer.gson().deserializeFromTree(object.get("subtitle")), deserializeTitleTimes(object.getAsJsonObject("times")) ); } else {