diff --git a/pom.xml b/pom.xml index ab46e0a..3c39cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,20 @@ ${project.basedir}/lib/CatServerSRG-b10faff.jar + + org.spigotmc + spigot-api + 1.12.2-R0.1-SNAPSHOT + provided + + + + org.spigotmc + spigot + 1.12.2-R0.1-SNAPSHOT + provided + + me.clip placeholderapi diff --git a/src/main/java/cc/carm/plugin/timereward/database/DataManager.java b/src/main/java/cc/carm/plugin/timereward/database/DataManager.java index bbb876a..bbe2564 100644 --- a/src/main/java/cc/carm/plugin/timereward/database/DataManager.java +++ b/src/main/java/cc/carm/plugin/timereward/database/DataManager.java @@ -3,9 +3,9 @@ package cc.carm.plugin.timereward.database; import cc.carm.lib.easysql.EasySQL; import cc.carm.lib.easysql.api.SQLManager; import cc.carm.plugin.timereward.Main; -import me.clip.placeholderapi.libs.gson.Gson; -import me.clip.placeholderapi.libs.gson.JsonElement; -import me.clip.placeholderapi.libs.gson.JsonParser; +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -16,8 +16,8 @@ import java.util.Set; import java.util.UUID; public class DataManager { - protected static final Gson GSON = new Gson(); + protected static final JsonParser PARSER = new JsonParser(); private SQLManager sqlManager; public boolean initialize() { @@ -82,7 +82,7 @@ public class DataManager { if (!resultSet.next()) return new LinkedHashSet<>(); String json = resultSet.getString("value"); if (json == null) return new LinkedHashSet<>(); - JsonElement element = JsonParser.parseString(json); + JsonElement element = PARSER.parse(json); if (!element.isJsonArray()) return new LinkedHashSet<>(); Set ids = new LinkedHashSet<>(); for (JsonElement e : element.getAsJsonArray()) { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c8f02a7..f879ad5 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -8,6 +8,9 @@ website: ${project.url} authors: - CarmJos +softdepend: + - PlaceholderAPI + commands: "TimeReward": permission: "TimeReward.admin"