diff --git a/build.gradle.kts b/build.gradle.kts index 0db2629..e671649 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { testRuntimeOnly("org.junit.platform:junit-platform-launcher") implementation("org.jetbrains:annotations:24.0.0") annotationProcessor("org.jetbrains:annotations:24.0.0") - implementation("com.alibaba.fastjson2:fastjson2:2.0.57") + implementation("com.fasterxml.jackson.core:jackson-databind:2.19.1") implementation("com.mingliqiye:network-endpoint:1.0.3") } diff --git a/gradle.properties b/gradle.properties index 16a913b..7cd77a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ GROUPSID=com.mingliqiye ARTIFACTID=minecraft-SLP -VERSIONS=1.0.1 +VERSIONS=1.0.2 MAINCLASS=com.mingliqiye.minecraftSLP.Main JDKVERSIONS=1.8 diff --git a/package.json b/package.json index 7b1338a..78b1de0 100644 --- a/package.json +++ b/package.json @@ -1,18 +1,18 @@ { - "name": "maven-repository", - "version": "1.0.0", - "description": "", - "scripts": { - "build": "gradle build-jar", - "buildw": "gradlew build-jar", - "format": "prettier --write \"**/*.java\"" - }, - "keywords": [], - "author": "", - "license": "ISC", - "packageManager": "pnpm@10.4.1", - "devDependencies": { - "prettier-plugin-java": "^2.7.1", - "prettier": "^3.6.2" - } + "name": "maven-repository", + "version": "1.0.0", + "description": "", + "scripts": { + "build": "gradle build-jar", + "buildw": "gradlew build-jar", + "format": "prettier --write \"**/*.{java,json}\"" + }, + "keywords": [], + "author": "", + "license": "ISC", + "packageManager": "pnpm@10.4.1", + "devDependencies": { + "prettier-plugin-java": "^2.7.1", + "prettier": "^3.6.2" + } } diff --git a/src/main/java/com/mingliqiye/minecraftSLP/Main.java b/src/main/java/com/mingliqiye/minecraftSLP/Main.java index b37d71f..6ca90a6 100644 --- a/src/main/java/com/mingliqiye/minecraftSLP/Main.java +++ b/src/main/java/com/mingliqiye/minecraftSLP/Main.java @@ -6,6 +6,10 @@ import java.io.IOException; public class Main { + static { + System.setProperty("fastjson2.parser.safeMode", "true"); + } + public static void main(String[] args) { if (args.length != 1) { System.err.println("请使用 {地址}:{端口号}"); diff --git a/src/main/java/com/mingliqiye/minecraftSLP/SLP.java b/src/main/java/com/mingliqiye/minecraftSLP/SLP.java index f9a8610..b870f69 100644 --- a/src/main/java/com/mingliqiye/minecraftSLP/SLP.java +++ b/src/main/java/com/mingliqiye/minecraftSLP/SLP.java @@ -1,6 +1,6 @@ package com.mingliqiye.minecraftSLP; -import com.alibaba.fastjson2.JSON; +import com.fasterxml.jackson.databind.ObjectMapper; import com.mingliqiye.network.endpoint.NetworkEndpoint; import java.io.*; import java.net.Socket; @@ -9,6 +9,8 @@ import java.nio.ByteOrder; public class SLP { + private static final ObjectMapper objectMapper = new ObjectMapper(); + /** * 将 int32 4个字节 转换为 short 2 个字节 * @param value int32 @@ -72,7 +74,7 @@ public class SLP { int lengthjson = readVarInt(inputStream); byte[] data = new byte[lengthjson]; inputStream.readFully(data); - MinecraftServerStatus serverStatus = JSON.parseObject( + MinecraftServerStatus serverStatus = objectMapper.readValue( data, MinecraftServerStatus.class );