Updated skBee

Updated skBee to Latest version.
cooffeeRequired · Feb 22, 2023 · ecb3200 · ecb3200
1 parent f788f2c
commit ecb3200
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 32 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     /*
     net.minecraft.server
     compileOnly 'org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT' // The Spigot API with no shadowing. Requires the OSS repo.
-    compileOnly 'org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT' // The full Spigot server with no shadowing. Requires mavenLocal.
+    compileOnly 'org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT' // The full Spigot server with no shadowing. Requires mavenLocal..
      */
 
 
@@ -48,6 +48,8 @@ dependencies {
 
     //Shadowing
     shadow 'com.google.code.gson:gson:2.10.1'
+
+    testCompileOnly "io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT"
 }
 tasks.withType(JavaCompile).configureEach {
     options.compilerArgs += ["-source", "11", "-target", "11"]

diff --git a/libs/skbee.jar b/libs/skbee.jar
diff --git a/src/main/java/cz/coffee/SkJson.java b/src/main/java/cz/coffee/SkJson.java
@@ -107,25 +107,6 @@ public void onDisable() {
         info("&eDisabling... good bye!");
     }
 
-    @SuppressWarnings("unused")
-    public static void warning(String string) {
-        logger.warning(util.color("&e" + string));
-    }
-
-    // Logging
-    public static void info(String string) {
-        logger.info(util.color(string));
-    }
-
-    @SuppressWarnings("unused")
-    public static void debug(Object str) {
-        logger.severe(util.color("DEBUG! " + "&r" + str));
-    }
-
-    public static void severe(String string) {
-        logger.severe(util.color("&c" + string));
-    }
-
     @Override
     public void onEnable() {
         instance = this;
@@ -176,4 +157,22 @@ public static void console(String string) {
         String prefix = version.isLegacy() ? util.color("&7[&ask&2Json&7]") : "&7[" + hex("#B6E69Cs#9BD97Ek#80CC61J#65BF43s#4AB226o#2FA508n") + "&7]";
         Bukkit.getServer().getConsoleSender().sendMessage(util.color(prefix + " " + (version.isLegacy() ? util.color(string) : hex(string))));
     }
+    @SuppressWarnings("unused")
+    public static void warning(String string) {
+        logger.warning(util.color("&e" + string));
+    }
+
+    // Logging
+    public static void info(String string) {
+        logger.info(util.color(string));
+    }
+
+    @SuppressWarnings("unused")
+    public static void debug(Object str) {
+        logger.severe(util.color("DEBUG! " + "&r" + str));
+    }
+
+    public static void severe(String string) {
+        logger.severe(util.color("&c" + string));
+    }
 }
diff --git a/src/main/java/cz/coffee/adapter/DefaultAdapters.java b/src/main/java/cz/coffee/adapter/DefaultAdapters.java
@@ -6,7 +6,8 @@
 import ch.njol.yggdrasil.YggdrasilSerializable;
 import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
-import com.shanebeestudios.skbee.api.NBT.*;
+import com.shanebeestudios.skbee.api.nbt.NBTCompound;
+import com.shanebeestudios.skbee.api.nbt.NBTContainer;
 import cz.coffee.SkJson;
 import cz.coffee.utils.Type;
 import cz.coffee.utils.github.Version;

diff --git a/src/main/java/cz/coffee/skript/effects/EffMap.java b/src/main/java/cz/coffee/skript/effects/EffMap.java
@@ -28,12 +28,11 @@
 import ch.njol.util.Kleenean;
 import com.google.gson.JsonElement;
 import cz.coffee.adapter.DefaultAdapters;
+import cz.coffee.utils.json.JsonMapping;
 import org.bukkit.event.Event;
 import org.eclipse.jdt.annotation.Nullable;
 import org.jetbrains.annotations.NotNull;
 
-import static cz.coffee.utils.json.JsonMapping.listToJson;
-
 
 @Name("Mapping Json to List")
 @Description("Mapping json to the List and get those values")
@@ -59,7 +58,7 @@ public class EffMap extends Effect {
     protected void execute(@NotNull Event e) {
         Object jsonObject = jsonElementExpression.getSingle(e);
         JsonElement json = DefaultAdapters.parse(jsonObject, jsonElementExpression, e);
-        listToJson(variableString.toString(e).substring(0, variableString.toString(e).length() - 3), json, isLocal, e);
+        JsonMapping.jsonToList(variableString.toString(e).substring(0, variableString.toString(e).length() - 3), json, isLocal, e);
     }
 
     @Override

diff --git a/src/main/java/cz/coffee/skript/expressions/ExprCreateJson.java b/src/main/java/cz/coffee/skript/expressions/ExprCreateJson.java
@@ -173,7 +173,7 @@ public boolean init(Expression<?> @NotNull [] expressions, int i, @NotNull Kleen
             }
             return false;
         } else if (pattern == 4) {
-            sendMessage("This is a deprecated syntax, &f&lTry that expression without &c&7'&f... &cnew&f json from text ...", ERROR);
+            Skript.error("This is a deprecated syntax. Don't use syntax like 'new json from ...'");
             return false;
         } else {
             exprToSerialize = LiteralUtils.defendExpression(expressions[0]);

diff --git a/src/main/java/cz/coffee/skript/expressions/ExprSkriptToJson.java b/src/main/java/cz/coffee/skript/expressions/ExprSkriptToJson.java
@@ -37,7 +37,6 @@
 
 import static cz.coffee.utils.ErrorHandler.Level.ERROR;
 import static cz.coffee.utils.ErrorHandler.*;
-import static cz.coffee.utils.json.JsonMapping.listToJson;
 
 @Name("Array or List formatted to JSON.")
 @Description({"It allows you to convert the sheet back to Json!",

diff --git a/src/main/java/cz/coffee/skript/test/SkJsonEffectTest.java b/src/main/java/cz/coffee/skript/test/SkJsonEffectTest.java
@@ -26,7 +26,6 @@
 import ch.njol.util.Kleenean;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import com.shanebeestudios.skbee.api.NBT.NBTContainer;
 import cz.coffee.utils.ErrorHandler;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;

diff --git a/src/main/java/cz/coffee/utils/json/JsonMapping.java b/src/main/java/cz/coffee/utils/json/JsonMapping.java
@@ -118,7 +118,7 @@ public static JsonElement listToJson(@NotNull String name, boolean isLocal, Even
      * @param isLocal value contain if variable is local or nah
      * @param event   {@link Event}
      */
-    public static void listToJson(@NotNull String name, JsonElement json, boolean isLocal, Event event) {
+    public static void jsonToList(@NotNull String name, JsonElement json, boolean isLocal, Event event) {
         JsonElement next;
         Deque<JsonElement> elements = new ArrayDeque<>();
         if (json != null) elements.add(json);
@@ -172,11 +172,11 @@ private static void extractNestedObjects(@NotNull String variableName, @NotNull
         if (input instanceof JsonObject) {
             input.getAsJsonObject().keySet().forEach(key -> {
                 if (!(key == null))
-                    listToJson(variableName + SEPARATOR + key, input.getAsJsonObject().get(key), isLocal, event);
+                    jsonToList(variableName + SEPARATOR + key, input.getAsJsonObject().get(key), isLocal, event);
             });
         } else if (input instanceof JsonArray) {
             for (int index = 0; input.getAsJsonArray().size() > index; index++)
-                listToJson(variableName + SEPARATOR + (index + 1), input.getAsJsonArray().get(index), isLocal, event);
+                jsonToList(variableName + SEPARATOR + (index + 1), input.getAsJsonArray().get(index), isLocal, event);
         }
     }
 }
diff --git a/src/main/java/cz/coffee/utils/nbt/NBTInternalConvertor.java b/src/main/java/cz/coffee/utils/nbt/NBTInternalConvertor.java
@@ -19,8 +19,8 @@
 package cz.coffee.utils.nbt;
 
 import com.google.gson.JsonElement;
-import com.shanebeestudios.skbee.api.NBT.NBTCompound;
-import com.shanebeestudios.skbee.api.NBT.NBTContainer;
+import com.shanebeestudios.skbee.api.nbt.NBTCompound;
+import com.shanebeestudios.skbee.api.nbt.NBTContainer;
 
 
 @SuppressWarnings("unused")