add: Skript scripts path identifier ~

fix: parsing nbt file.
cooffeeRequired · Mar 18, 2024 · 482cd17 · 482cd17
1 parent 1d97d4a
commit 482cd17
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>cz.coffee</groupId>
     <artifactId>skJson</artifactId>
-    <version>3.0.6</version>
+    <version>3.0.7</version>
     <packaging>jar</packaging>
 
     <name>SkJson</name>

diff --git a/src/main/java/cz/coffee/skjson/api/FileHandler.java b/src/main/java/cz/coffee/skjson/api/FileHandler.java
@@ -1,6 +1,8 @@
 package cz.coffee.skjson.api;
 
 import com.google.gson.*;
+import cz.coffee.skjson.utils.Logger;
+import org.bukkit.Bukkit;
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.BufferedReader;
@@ -47,6 +49,10 @@ public static CompletableFuture<JsonElement> get(final String file) {
      */
     public static CompletableFuture<JsonElement> get(final File file) {
         return CompletableFuture.supplyAsync(() -> {
+            if (!file.exists()) {
+                Logger.warn("File " + file + " does not exist");
+                return JsonNull.INSTANCE;
+            }
             try (var reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8))) {
                 var split = file.getName().split("\\.");
                 var ext = split[split.length - 1];
@@ -79,11 +85,19 @@ public static <T> T await(CompletableFuture<T> future) throws ExecutionException
         return future.get();
     }
 
-    public static CompletableFuture<Boolean> write(final String filePath, JsonElement content) {
+    public static CompletableFuture<Boolean> write(String filePath, JsonElement content) {
+        if (filePath.startsWith("~")) {
+            //noinspection DataFlowIssue
+            filePath = Bukkit.getPluginManager().getPlugin("Skript").getDataFolder() + "/scripts" + "/" + filePath.substring(1);
+        }
         return createOrWrite(filePath, content, true);
     }
 
-    public static CompletableFuture<Boolean> createOrWrite(final String filePath, JsonElement content) {
+    public static CompletableFuture<Boolean> createOrWrite(String filePath, JsonElement content) {
+        if (filePath.startsWith("~")) {
+            //noinspection DataFlowIssue
+            filePath = Bukkit.getPluginManager().getPlugin("Skript").getDataFolder() + "/scripts" + "/" + filePath.substring(1);
+        }
         return createOrWrite(filePath, content, false);
     }
 

diff --git a/src/main/java/cz/coffee/skjson/skript/base/NewJsonExpression.java b/src/main/java/cz/coffee/skjson/skript/base/NewJsonExpression.java
@@ -77,6 +77,14 @@ public class NewJsonExpression extends SimpleExpression<JsonElement> {
     private boolean inputIsRegex;
     private JsonExpressionString regexInput;
 
+    @SuppressWarnings("DataFlowIssue")
+    private File sanitizedFile(String file) {
+        if (file.startsWith("~")) {
+            return new File(Bukkit.getPluginManager().getPlugin("Skript").getDataFolder(), "scripts" + "/" + file.substring(1));
+        }
+        return new File(file);
+    }
+
     @Override
     protected JsonElement @NotNull [] get(@NotNull Event e) {
         List<JsonElement> output = new ArrayList<>();
@@ -94,7 +102,7 @@ public class NewJsonExpression extends SimpleExpression<JsonElement> {
             if (isFile) {
                 String stringifyFile = values[0].toString();
                 if (stringifyFile != null) {
-                    final File file = new File(stringifyFile);
+                    final File file = sanitizedFile(stringifyFile);
 
                     // make a sensitization for Failed get from FileWrapper
                     JsonElement json = FileHandler.get(file).join();

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -2,8 +2,8 @@ name: SkJson
 version: '${project.version}'
 main: cz.coffee.skjson.SkJson
 api-version: '1.16'
-revision-version: 'd4eb6e046'
-full-revision-sha1: 'd4eb6e046bdf624dcae0b4cb3a3bda785d6b211534aa1d5099ac8c684819d0d5'
+revision-version: '2c1b525c1'
+full-revision-sha1: '2c1b525c1f3af22143a8ce5d59ce7b9eb30df41eb79d4da34931997f08c818ca'
 depend:
   - Skript
 prefix: SkJson