MiniDay/hamster-core
1
0
Fork 0
Code Issues Pull Requests Actions Releases 8 Activity

feat: 添加更多工具方法

Browse Source
This commit is contained in:
叁只仓鼠
2022-11-04 00:34:22 +08:00
parent a78b0709c6
commit c9ffce066e
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/SerializeUtils.java → hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/BukkitSerializeUtils.java
View File

@@ -15,8 +15,8 @@ import java.io.IOException;
import java.util.logging.Level; import java.util.logging.Level;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public final class SerializeUtils { public final class BukkitSerializeUtils {
private SerializeUtils() { private BukkitSerializeUtils() {
} }
@Nullable @Nullable

3
hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java
View File

@@ -1,6 +1,5 @@
package cn.hamster3.mc.plugin.core.common.data; 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 cn.hamster3.mc.plugin.core.common.util.SerializeUtils;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
@@ -295,6 +294,6 @@ public class DisplayMessage {
@Override @Override
public String toString() { public String toString() {
return CoreConstantObjects.GSON.toJson(this); return saveToJson().toString();
} }
} }

6
hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CommonUtils.java
View File

@@ -8,6 +8,7 @@ import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
@@ -64,10 +65,7 @@ public final class CommonUtils {
*/ */
@NotNull @NotNull
public static String replaceColorCode(@Nullable String string, @NotNull String defaultValue) { public static String replaceColorCode(@Nullable String string, @NotNull String defaultValue) {
if (string == null) { return replaceColorCode(Objects.requireNonNullElse(string, defaultValue));
return replaceColorCode(defaultValue);
}
return replaceColorCode(string);
} }
/** /**

6
hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/SerializeUtils.java
View File

@@ -1,10 +1,8 @@
package cn.hamster3.mc.plugin.core.common.util; package cn.hamster3.mc.plugin.core.common.util;
import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import net.kyori.adventure.key.Key; import net.kyori.adventure.key.Key;
import net.kyori.adventure.sound.Sound; import net.kyori.adventure.sound.Sound;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.adventure.title.Title; import net.kyori.adventure.title.Title;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@@ -46,8 +44,8 @@ public final class SerializeUtils {
public static Title deserializeTitle(@NotNull JsonObject object) { public static Title deserializeTitle(@NotNull JsonObject object) {
if (object.has("times")) { if (object.has("times")) {
return Title.title( return Title.title(
CoreConstantObjects.GSON.fromJson(object.get("title"), Component.class), GsonComponentSerializer.gson().deserializeFromTree(object.get("title")),
CoreConstantObjects.GSON.fromJson(object.get("subtitle"), Component.class), GsonComponentSerializer.gson().deserializeFromTree(object.get("subtitle")),
deserializeTitleTimes(object.getAsJsonObject("times")) deserializeTitleTimes(object.getAsJsonObject("times"))
); );
} else { } else {