diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java index 79c5fe6..099c66d 100644 --- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java +++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java @@ -39,6 +39,7 @@ public abstract class BallAPI { /** * API 实例 */ + @Getter protected static BallAPI instance; @NotNull protected final Map serverInfo; @@ -131,15 +132,6 @@ public abstract class BallAPI { enabled = false; } - /** - * 获取 API 实例 - * - * @return API 实例 - */ - public static BallAPI getInstance() { - return instance; - } - protected void enable() throws SQLException, InterruptedException { if (enabled) { return; diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java index 32ea9ce..c6e08bc 100644 --- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java +++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/config/BallConfig.java @@ -10,10 +10,8 @@ import org.jetbrains.annotations.NotNull; public class BallConfig { @NotNull private BallServerInfo localInfo; - @NotNull private String host; private int port; - private int eventLoopThread; } diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallBlockPos.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallBlockPos.java index 1ccfa9e..b45f1f0 100644 --- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallBlockPos.java +++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallBlockPos.java @@ -12,16 +12,19 @@ import org.jetbrains.annotations.NotNull; @AllArgsConstructor @SuppressWarnings("unused") public class BallBlockPos { + @NotNull private String serverID; + @NotNull private String worldName; private int x; private int y; private int z; - public static BallBlockPos fromJson(String json) { + public static BallBlockPos fromJson(@NotNull String json) { return CoreAPI.getInstance().getGson().fromJson(json, BallBlockPos.class); } + @NotNull public JsonElement toJson() { return CoreAPI.getInstance().getGson().toJsonTree(this); } diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallLocation.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallLocation.java index 1ddf1a1..13308af 100644 --- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallLocation.java +++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallLocation.java @@ -12,7 +12,9 @@ import org.jetbrains.annotations.NotNull; @AllArgsConstructor @SuppressWarnings("unused") public class BallLocation { + @NotNull private String serverID; + @NotNull private String worldName; private double x; private double y; @@ -21,10 +23,11 @@ public class BallLocation { private float yaw; private float pitch; - public static BallLocation fromJson(String json) { + public static BallLocation fromJson(@NotNull String json) { return CoreAPI.getInstance().getGson().fromJson(json, BallLocation.class); } + @NotNull public JsonElement toJson() { return CoreAPI.getInstance().getGson().toJsonTree(this); } diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java index 741adb2..2b9c778 100644 --- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java +++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/data/BallMessageInfo.java @@ -113,6 +113,7 @@ public class BallMessageInfo { * @param 对象类型 * @return Java 对象 */ + @NotNull public T getContentAs(@NotNull Class clazz) { return CoreAPI.getInstance().getGson().fromJson(content, clazz); } diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java index 4364117..5664245 100644 --- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java +++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/entity/BallPlayerInfo.java @@ -2,6 +2,7 @@ package cn.hamster3.mc.plugin.ball.common.entity; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import java.util.UUID; @@ -10,7 +11,7 @@ import java.util.UUID; * 玩家信息 */ @Data -@NotNull +@NoArgsConstructor @AllArgsConstructor public class BallPlayerInfo { /**