chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.5.6

Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.4 to 3.5.5.
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.4...surefire-3.5.5)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-version: 3.5.5
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/deploy.yml

@@ -15,9 +15,9 @@ jobs:
     name: "Publish Project (GitHub Packages)"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -39,9 +39,9 @@ jobs:
     name: "Deploy Project (Central Repository)"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -63,9 +63,9 @@ jobs:
     name: "Deploy Project (GitHub Repository)"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           java-version: '11'
           distribution: 'adopt'

.github/workflows/maven.yml

@@ -15,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -26,7 +26,7 @@ jobs:
       - name: "Target Stage"
         run: mkdir staging && cp target/*.jar staging
       - name: "Upload artifact"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v7
         with:
           name: Artifact
           path: staging

README.md

@@ -16,26 +16,26 @@ A JSON serialize/deserialize util for bukkit's ConfigurationSerialization.
 First, we should get the serializer instance or create a new one.
 
 ```java
-   BukkitJSONSerializer serializer=BukkitJSONSerializer.get();
+BukkitJSONSerializer serializer = BukkitJSONSerializer.get();
 ```
 
-Then, we cloud use `BukkitJSONSerializer#serializeToJSON(ConfigurationSerializable)` to serialize a object to JSON.
+Then, we could use `serializeToJSON(ConfigurationSerializable)` to serialize a object to JSON.
 
 ```jave
-        Location location = new Location(Bukkit.getWorlds().get(0), -100.5, 100, 105.5);
+Location location = new Location(Bukkit.getWorlds().get(0), -100.5, 100, 105.5);
-        String serialized = BukkitJSONSerializer.serializeToJSON(location);
+String serialized = serializer.serializeToJSON(location);
-        // serialized -> {"world":"world","x":-100.5,"y":100,"z":105.5,"yaw":0.0,"pitch":0.0}
+// -> {"world":"world","x":-100.5,"y":100,"z":105.5,"yaw":0.0,"pitch":0.0}
 ```
 
-When we need to read the object, just use `BukkitJSONSerializer#deserializeSON(json,typeClass)` to deserialize the JSON
+When we need to read the object, just use `deserializeJSON(json,typeClass)` to deserialize the JSON
 string.
 
 ```java
-        Location location = serializer.deserializeSON(json, Location.class);
+Location location = serializer.deserializeJSON(json, Location.class);
-        // deserialized -> Location{world=world, x=-100.5, y=100, z=105.5, pitch=0.0, yaw=0.0}
+// Location{world=world, x=-100.5, y=100, z=105.5, pitch=0.0, yaw=0.0}
 ```
 
-Or use `BukkitJSONSerializer#deserializeSON(json,typeClass,defaultValue)` if we need a default value.
+Or use `deserializeSON(json,typeClass,defaultValue)` if we need a default value.
 
 ### JSONSerializable class
 
@@ -114,4 +114,4 @@ dependencies {
 
 ## Open Source License.
 
-The project using [GNU LESSER GENERAL PUBLIC LICENSE](https://www.gnu.org/licenses/lgpl-3.0.html) .
+The project using [GNU LESSER GENERAL PUBLIC LICENSE](https://www.gnu.org/licenses/lgpl-3.0.html) .

pom.xml

@@ -13,7 +13,7 @@
     </properties>
     <groupId>cc.carm.lib</groupId>
     <artifactId>bukkitjsonserializer</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.2</version>
 
     <name>BukkitJSONSerializer</name>
     <description>A JSON serialize/deserialize util for bukkit's ConfigurationSerialization.</description>
@@ -81,14 +81,14 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.8.8-R0.1-SNAPSHOT</version>
+            <version>1.17-R0.1</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>23.0.0</version>
+            <version>26.1.0</version>
             <scope>provided</scope>
         </dependency>
 
@@ -107,7 +107,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.5.6</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
@@ -115,7 +115,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.12.0</version>
                 <configuration>
                     <classifier>javadoc</classifier>
                     <detectJavaApiLink>false</detectJavaApiLink>
@@ -142,7 +142,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.15.0</version>
                 <configuration>
                     <source>${jdk.version}</source>
                     <target>${jdk.version}</target>
@@ -153,12 +153,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.2</version>
+                <version>3.5.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -171,7 +171,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.2.8</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -191,7 +191,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
+                <version>3.3.1</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

src/main/java/cc/carm/lib/bukkit/configuration/BukkitJSONSerializer.java

@@ -10,6 +10,7 @@ import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.math.BigDecimal;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -29,8 +30,13 @@ public class BukkitJSONSerializer {
     public static final String TYPE_KEY = ConfigurationSerialization.SERIALIZED_TYPE_KEY;
     public static final BukkitJSONSerializer INSTANCE = BukkitJSONSerializer.create();
 
+
     public static @NotNull BukkitJSONSerializer create() {
-        return create(new GsonBuilder().disableHtmlEscaping().create(), new JsonParser());
+        return create(new GsonBuilder().enableComplexMapKeySerialization().serializeNulls().disableHtmlEscaping().create());
+    }
+
+    public static @NotNull BukkitJSONSerializer create(@NotNull Gson gson) {
+        return new BukkitJSONSerializer(gson, new JsonParser());
     }
 
     public static @NotNull BukkitJSONSerializer create(@NotNull Gson gson, @NotNull JsonParser parser) {
@@ -163,12 +169,26 @@ public class BukkitJSONSerializer {
                 } else {
                     args.put(key, sub);
                 }
+            } else if (v instanceof Double) {
+                double d = (Double) v;
+                BigDecimal num = new BigDecimal(d);
+                long longValue = num.longValue();
+                String decimalPart = String.valueOf(num.subtract(new BigDecimal(longValue)));
+
+                if (decimalPart.matches("^0+$")) {
+                    if (longValue > Integer.MAX_VALUE || longValue < Integer.MIN_VALUE) {
+                        args.put(key, num.longValue());
+                    } else {
+                        args.put(key, num.intValue());
+                    }
+                }
+
             } else {
                 args.put(key, v);
             }
+            
         });
         return args;
     }
 
-
 }